Share allocation helpers between CoreCLR and NativeAOT

src/coreclr/System.Private.CoreLib/src/System/String.CoreCLR.cs

@@ -25,7 +25,13 @@ internal static unsafe string StrCns(uint rid, IntPtr scopeHandle)
         }
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern string FastAllocateString(int length);
+        internal static extern unsafe string FastAllocateString(MethodTable *pMT, int length);
+
+        [DebuggerHidden]
+        internal static unsafe string FastAllocateString(int length)
+        {
+            return FastAllocateString(TypeHandle.TypeHandleOf<string>().AsMethodTable(), length);
+        }
 
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "String_Intern")]
         private static partial void Intern(StringHandleOnStack src);

src/coreclr/inc/eventtracebase.h

@@ -960,7 +960,6 @@ namespace ETW
         static VOID SendMethodDetailsEvent(MethodDesc *pMethodDesc);
         static VOID SendNonDuplicateMethodDetailsEvent(MethodDesc* pMethodDesc, MethodDescSet* set);
         static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName);
-        static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers);
         static VOID MethodRestored(MethodDesc * pMethodDesc);
         static VOID MethodTableRestored(MethodTable * pMethodTable);
         static VOID DynamicMethodDestroyed(MethodDesc *pMethodDesc);
@@ -972,7 +971,6 @@ namespace ETW
         static VOID MethodJitting(MethodDesc *pMethodDesc, COR_ILMETHOD_DECODER* methodDecoder, SString *namespaceOrClassName, SString *methodName, SString *methodSignature);
         static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName, SString *methodName, SString *methodSignature, PCODE pNativeCodeStartAddress, PrepareCodeConfig *pConfig);
         static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {};
-        static VOID StubsInitialized(PVOID *pHelperStartAddress, PVOID *pHelperNames, LONG ulNoOfHelpers) {};
         static VOID MethodRestored(MethodDesc * pMethodDesc) {};
         static VOID MethodTableRestored(MethodTable * pMethodTable) {};
         static VOID DynamicMethodDestroyed(MethodDesc *pMethodDesc) {};

src/coreclr/inc/jithelpers.h

@@ -33,8 +33,7 @@
 #define FEATURE_USE_HELPERS_FOR_32BIT_INT_DIV
 #endif
 
-// pfnHelper is set to NULL if it is a stubbed helper.
-// It will be set in InitJITHelpers1
+// pfnHelper is set to NULL if it is an unused helper.
 
     JITHELPER(CORINFO_HELP_UNDEF,               NULL,               METHOD__NIL)
 
@@ -100,20 +99,20 @@
     JITHELPER(CORINFO_HELP_DBLREM,              JIT_DblRem,         METHOD__NIL)
 
     // Allocating a new object
-    JITHELPER(CORINFO_HELP_NEWFAST,                     JIT_New,    METHOD__NIL)
-    JITHELPER(CORINFO_HELP_NEWFAST_MAYBEFROZEN,         JIT_NewMaybeFrozen,METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEWSFAST,             JIT_New,    METHOD__NIL)
-    JITHELPER(CORINFO_HELP_NEWSFAST_FINALIZE,           NULL,       METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8,      JIT_New,    METHOD__NIL)
-    JITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8_VC,          NULL,       METHOD__NIL)
-    JITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8_FINALIZE,    NULL,       METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEW_MDARR,            NULL,       METHOD__ARRAY__CREATEINSTANCEMDARRAY)
-    DYNAMICJITHELPER(CORINFO_HELP_NEW_MDARR_RARE,       NULL,       METHOD__ARRAY__CREATEINSTANCEMDARRAY)
-    JITHELPER(CORINFO_HELP_NEWARR_1_DIRECT,             JIT_NewArr1,METHOD__NIL)
-    JITHELPER(CORINFO_HELP_NEWARR_1_MAYBEFROZEN,        JIT_NewArr1MaybeFrozen,METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_OBJ,         JIT_NewArr1,METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_VC,          JIT_NewArr1,METHOD__NIL)
-    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_ALIGN8,      JIT_NewArr1,METHOD__NIL)
+    JITHELPER(CORINFO_HELP_NEWFAST,                     RhpNew,                   METHOD__NIL)
+    JITHELPER(CORINFO_HELP_NEWFAST_MAYBEFROZEN,         RhpNewMaybeFrozen,        METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWSFAST,             RhpNew,                   METHOD__NIL)
+    JITHELPER(CORINFO_HELP_NEWSFAST_FINALIZE,           NULL,                     METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8,      RhpNew,                   METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8_VC,   RhpNew,                   METHOD__NIL)
+    JITHELPER(CORINFO_HELP_NEWSFAST_ALIGN8_FINALIZE,    NULL,                     METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEW_MDARR,            NULL,                     METHOD__ARRAY__CREATEINSTANCEMDARRAY)
+    DYNAMICJITHELPER(CORINFO_HELP_NEW_MDARR_RARE,       NULL,                     METHOD__ARRAY__CREATEINSTANCEMDARRAY)
+    JITHELPER(CORINFO_HELP_NEWARR_1_DIRECT,             RhpNewVariableSizeObject, METHOD__NIL)
+    JITHELPER(CORINFO_HELP_NEWARR_1_MAYBEFROZEN,        RhpNewArrayMaybeFrozen,   METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_OBJ,         RhpNewVariableSizeObject, METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_VC,          RhpNewVariableSizeObject, METHOD__NIL)
+    DYNAMICJITHELPER(CORINFO_HELP_NEWARR_1_ALIGN8,      RhpNewVariableSizeObject, METHOD__NIL)
 
     DYNAMICJITHELPER(CORINFO_HELP_STRCNS,               NULL,       METHOD__STRING__STRCNS)
 

src/coreclr/nativeaot/BuildIntegration/NativeAOT.natstepfilter

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <StepFilter xmlns="http://schemas.microsoft.com/vstudio/debugger/natstepfilter/2010">
     <Function>
-        <Name>RhpNewFast|RhpNewFinalizable|RhpNewFastAlign8|RhpNewFastMisalign|RhpNewFinalizableAlign8|RhpNewArray|RhpNewArrayAlign8</Name>
+        <Name>RhpNewFast|RhpNewFinalizable|RhpNewFastAlign8|RhpNewFastMisalign|RhpNewFinalizableAlign8|RhpNewArrayFast|RhpNewArrayFastAlign8</Name>
         <Action>NoStepInto</Action>
     </Function>
 </StepFilter>

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/InternalCalls.cs

@@ -128,9 +128,9 @@ internal static int RhEndNoGCRegion()
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal static extern unsafe object RhpNewFinalizable(MethodTable* pEEType);
 
-        [RuntimeImport(RuntimeLibrary, "RhpNewArray")]
+        [RuntimeImport(RuntimeLibrary, "RhpNewArrayFast")]
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern unsafe object RhpNewArray(MethodTable* pEEType, int length);
+        internal static extern unsafe object RhpNewArrayFast(MethodTable* pEEType, int length);
 
 #if FEATURE_64BIT_ALIGNMENT
         [RuntimeImport(RuntimeLibrary, "RhpNewFastAlign8")]
@@ -141,9 +141,9 @@ internal static int RhEndNoGCRegion()
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal static extern unsafe object RhpNewFinalizableAlign8(MethodTable* pEEType);
 
-        [RuntimeImport(RuntimeLibrary, "RhpNewArrayAlign8")]
+        [RuntimeImport(RuntimeLibrary, "RhpNewArrayFastAlign8")]
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern unsafe object RhpNewArrayAlign8(MethodTable* pEEType, int length);
+        internal static extern unsafe object RhpNewArrayFastAlign8(MethodTable* pEEType, int length);
 
         [RuntimeImport(RuntimeLibrary, "RhpNewFastMisalign")]
         [MethodImpl(MethodImplOptions.InternalCall)]

src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/RuntimeExports.cs

@@ -57,20 +57,44 @@ public static unsafe object RhNewObject(MethodTable* pEEType)
 
         [RuntimeExport("RhNewArray")]
         public static unsafe object RhNewArray(MethodTable* pEEType, int length)
+        {
+            Debug.Assert(pEEType->IsSzArray);
+
+#if FEATURE_64BIT_ALIGNMENT
+            MethodTable* pEEElementType = pEEType->RelatedParameterType;
+            if (pEEElementType->IsValueType && pEEElementType->RequiresAlign8)
+            {
+                return InternalCalls.RhpNewArrayFastAlign8(pEEType, length);
+            }
+            else
+#endif // FEATURE_64BIT_ALIGNMENT
+            {
+                return InternalCalls.RhpNewArrayFast(pEEType, length);
+            }
+        }
+
+        [RuntimeExport("RhNewVariableSizeObject")]
+        public static unsafe object RhNewVariableSizeObject(MethodTable* pEEType, int length)
         {
             Debug.Assert(pEEType->IsArray || pEEType->IsString);
 
+            object array;
 #if FEATURE_64BIT_ALIGNMENT
             MethodTable* pEEElementType = pEEType->RelatedParameterType;
             if (pEEElementType->IsValueType && pEEElementType->RequiresAlign8)
             {
-                return InternalCalls.RhpNewArrayAlign8(pEEType, length);
+                RuntimeImports.RhAllocateNewArray(pEEType, (uint)length, (uint)GC_ALLOC_FLAGS.GC_ALLOC_ALIGN8, &array);
             }
             else
 #endif // FEATURE_64BIT_ALIGNMENT
             {
-                return InternalCalls.RhpNewArray(pEEType, length);
+                RuntimeImports.RhAllocateNewArray(pEEType, (uint)length, (uint)GC_ALLOC_FLAGS.GC_ALLOC_NO_FLAGS, &array);
             }
+
+            if (array == null)
+                throw new OutOfMemoryException();
+
+            return array;
         }
 
         public static unsafe object RhBox(MethodTable* pEEType, ref byte data)
@@ -380,10 +404,10 @@ internal static unsafe IntPtr RhGetRuntimeHelperForType(MethodTable* pEEType, Ru
 #if FEATURE_64BIT_ALIGNMENT
                     MethodTable* pEEElementType = pEEType->RelatedParameterType;
                     if (pEEElementType->IsValueType && pEEElementType->RequiresAlign8)
-                        return (IntPtr)(delegate*<MethodTable*, int, object>)&InternalCalls.RhpNewArrayAlign8;
+                        return (IntPtr)(delegate*<MethodTable*, int, object>)&InternalCalls.RhpNewArrayFastAlign8;
 #endif // FEATURE_64BIT_ALIGNMENT
 
-                    return (IntPtr)(delegate*<MethodTable*, int, object>)&InternalCalls.RhpNewArray;
+                    return (IntPtr)(delegate*<MethodTable*, int, object>)&InternalCalls.RhpNewArrayFast;
 
                 default:
                     Debug.Fail("Unknown RuntimeHelperKind");

src/coreclr/nativeaot/Runtime/AsmOffsets.h

@@ -32,6 +32,8 @@ ASM_OFFSET(    4,     8, String, m_Length)
 ASM_OFFSET(    8,     C, String, m_FirstChar)
 ASM_CONST(     2,     2, STRING_COMPONENT_SIZE)
 ASM_CONST(     E,    16, STRING_BASE_SIZE)
+ASM_CONST(     C,    18, SZARRAY_BASE_SIZE)
+ASM_CONST(     C,    18, MIN_OBJECT_SIZE)
 ASM_CONST(3FFFFFDF,3FFFFFDF,MAX_STRING_LENGTH)
 
 

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -205,7 +205,7 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64)
 endif (CLR_CMAKE_TARGET_ARCH_AMD64)
 
 list(APPEND RUNTIME_SOURCES_ARCH_ASM
-  ${ARCH_SOURCES_DIR}/AllocFast.${ASM_SUFFIX}
+  ${RUNTIME_DIR}/${ARCH_SOURCES_DIR}/AllocFast.${ASM_SUFFIX}
   ${ARCH_SOURCES_DIR}/ExceptionHandling.${ASM_SUFFIX}
   ${ARCH_SOURCES_DIR}/GcProbe.${ASM_SUFFIX}
   ${ARCH_SOURCES_DIR}/MiscStubs.${ASM_SUFFIX}

src/coreclr/nativeaot/Runtime/GCHelpers.cpp

@@ -655,7 +655,7 @@ static Object* GcAllocInternal(MethodTable* pEEType, uint32_t uFlags, uintptr_t
 //  numElements     -  number of array elements
 //  pTransitionFrame-  transition frame to make stack crawlable
 // Returns a pointer to the object allocated or NULL on failure.
-EXTERN_C void* F_CALL_CONV RhpGcAlloc(MethodTable* pEEType, uint32_t uFlags, uintptr_t numElements, PInvokeTransitionFrame* pTransitionFrame)
+EXTERN_C void* RhpGcAlloc(MethodTable* pEEType, uint32_t uFlags, uintptr_t numElements, PInvokeTransitionFrame* pTransitionFrame)
 {
     Thread* pThread = ThreadStore::GetCurrentThread();
 

src/coreclr/nativeaot/Runtime/ObjectLayout.h

@@ -125,6 +125,9 @@ static uintptr_t const STRING_COMPONENT_SIZE = StringConstants::ComponentSize;
 //-------------------------------------------------------------------------------------------------
 static uintptr_t const STRING_BASE_SIZE = StringConstants::BaseSize;
 
+//-------------------------------------------------------------------------------------------------
+static uintptr_t const SZARRAY_BASE_SIZE = MIN_OBJECT_SIZE;
+
 //-------------------------------------------------------------------------------------------------
 static uintptr_t const MAX_STRING_LENGTH = 0x3FFFFFDF;
 

src/coreclr/nativeaot/Runtime/amd64/AsmMacros.inc

@@ -302,6 +302,8 @@ PUSH_COOP_PINVOKE_FRAME macro trashReg
 
     ;; allocate scratch space and any required alignment
     alloc_stack     28h
+
+    END_PROLOGUE
 endm
 
 ;;
@@ -322,6 +324,10 @@ POP_COOP_PINVOKE_FRAME macro
     pop         r10     ; discard caller RSP
 endm
 
+INLINE_GET_ALLOC_CONTEXT_BASE macro destReg, trashReg
+    INLINE_GET_TLS_VAR destReg, trashReg, tls_CurrentThread
+endm
+
 ;  - TAILCALL_RAX: ("jmp rax") should be used for tailcalls, this emits an instruction
 ;            sequence which is recognized by the unwinder as a valid epilogue terminator
 TAILJMP_RAX TEXTEQU <DB 048h, 0FFh, 0E0h>
@@ -335,10 +341,8 @@ TSF_DoNotTriggerGc              equ 10h
 ;;
 ;; Rename fields of nested structs
 ;;
-OFFSETOF__Thread__m_alloc_context__alloc_ptr        equ OFFSETOF__Thread__m_eeAllocContext + OFFSETOF__ee_alloc_context__m_rgbAllocContextBuffer + OFFSETOF__gc_alloc_context__alloc_ptr
-OFFSETOF__Thread__m_eeAllocContext__combined_limit  equ OFFSETOF__Thread__m_eeAllocContext + OFFSETOF__ee_alloc_context__combined_limit
-
-
+OFFSETOF__ee_alloc_context__alloc_ptr               equ OFFSETOF__ee_alloc_context__m_rgbAllocContextBuffer + OFFSETOF__gc_alloc_context__alloc_ptr
+OFFSETOF__ee_alloc_context                          equ OFFSETOF__Thread__m_eeAllocContext
 
 ;; GC type flags
 GC_ALLOC_FINALIZE               equ 1

src/coreclr/nativeaot/Runtime/arm64/AsmMacros.h

@@ -78,8 +78,8 @@ STATUS_REDHAWK_THREAD_ABORT      equ 0x43
 ;;
 ;; Rename fields of nested structs
 ;;
-OFFSETOF__Thread__m_alloc_context__alloc_ptr        equ OFFSETOF__Thread__m_eeAllocContext + OFFSETOF__ee_alloc_context__m_rgbAllocContextBuffer + OFFSETOF__gc_alloc_context__alloc_ptr
-OFFSETOF__Thread__m_eeAllocContext__combined_limit  equ OFFSETOF__Thread__m_eeAllocContext + OFFSETOF__ee_alloc_context__combined_limit
+OFFSETOF__ee_alloc_context__alloc_ptr        equ OFFSETOF__ee_alloc_context__m_rgbAllocContextBuffer + OFFSETOF__gc_alloc_context__alloc_ptr
+OFFSETOF__ee_alloc_context                   equ OFFSETOF__Thread__m_eeAllocContext
 
 ;;
 ;; IMPORTS
@@ -220,7 +220,6 @@ TrashRegister32Bit SETS "w":CC:("$TrashRegister32Bit":RIGHT:((:LEN:TrashRegister
         INLINE_GET_TLS_VAR $destReg, $trashReg, tls_CurrentThread
     MEND
 
-
     MACRO
         INLINE_THREAD_UNHIJACK $threadReg, $trashReg1, $trashReg2
         ;;
@@ -236,6 +235,12 @@ TrashRegister32Bit SETS "w":CC:("$TrashRegister32Bit":RIGHT:((:LEN:TrashRegister
 0
     MEND
 
+    MACRO
+        INLINE_GET_ALLOC_CONTEXT_BASE $destReg, $trashReg
+
+        INLINE_GET_TLS_VAR $destReg, $trashReg, tls_CurrentThread
+    MEND
+
 ;; ---------------------------------------------------------------------------- -
 ;;
 ;; Macro to add a memory barrier. Equal to __sync_synchronize().