More work on supporting generics in type system and execution engine

src/CLR/CorLib/corlib_native.cpp

@@ -696,6 +696,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Random::_ctor___VOID,
     Library_corlib_native_System_Random::_ctor___VOID__I4,
     nullptr,
+    Library_corlib_native_System_ReadOnlySpan_1::_ctor___VOID__VOIDptr__I4,
+    nullptr,
+    nullptr,
+    nullptr,
     nullptr,
     nullptr,
     nullptr,
@@ -711,6 +715,14 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     Library_corlib_native_System_Reflection_ConstructorInfo::GetCustomAttributes___SZARRAY_OBJECT__BOOLEAN,
     Library_corlib_native_System_Reflection_ConstructorInfo::Invoke___OBJECT__SZARRAY_OBJECT,
     nullptr,
@@ -798,6 +810,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    Library_corlib_native_System_Span_1::_ctor___VOID__VOIDptr__I4,
     nullptr,
     nullptr,
     nullptr,
@@ -827,6 +840,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     Library_corlib_native_System_Threading_AutoResetEvent::_ctor___VOID__BOOLEAN,
     Library_corlib_native_System_Threading_AutoResetEvent::Reset___BOOLEAN,
     Library_corlib_native_System_Threading_AutoResetEvent::Set___BOOLEAN,
@@ -1596,7 +1613,7 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
 
 #if (NANOCLR_REFLECTION == TRUE)
 
-    0x3C34952A,
+    0xCECAB752,
 
 #elif (NANOCLR_REFLECTION == FALSE)
 

src/CLR/CorLib/corlib_native.h

@@ -783,6 +783,7 @@ struct Library_corlib_native_System_ReadOnlySpan_1
     static const int FIELD___array = 1;
     static const int FIELD___length = 2;
 
+    NANOCLR_NATIVE_DECLARE(_ctor___VOID__VOIDptr__I4);
     NANOCLR_NATIVE_DECLARE(NativeReadOnlySpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4);
 
     //--//
@@ -962,6 +963,7 @@ struct Library_corlib_native_System_Span_1
     static const int FIELD___array = 1;
     static const int FIELD___length = 2;
 
+    NANOCLR_NATIVE_DECLARE(_ctor___VOID__VOIDptr__I4);
     NANOCLR_NATIVE_DECLARE(CopyTo___VOID__SystemSpan_1);
     NANOCLR_NATIVE_DECLARE(NativeSpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4);
 

src/CLR/CorLib/corlib_native_System_ReadOnlySpan_1.cpp

@@ -6,6 +6,105 @@
 
 #include "CorLib.h"
 
+typedef Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers RuntimeHelpers;
+
+HRESULT Library_corlib_native_System_ReadOnlySpan_1::_ctor___VOID__VOIDptr__I4(CLR_RT_StackFrame &stack)
+{
+    NANOCLR_HEADER();
+
+    int32_t length;
+    bool isRefContainsRefs = false;
+    uintptr_t objectRawPointer;
+
+    CLR_RT_HeapBlock *thisSpan = stack.This();
+
+    // grab caller to get the generic type
+    CLR_RT_MethodDef_Instance &caller = stack.MethodCall();
+
+    if (caller.genericType == nullptr || !NANOCLR_INDEX_IS_VALID(*caller.genericType))
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+    }
+
+    CLR_RT_TypeSpec_Instance typeSpec;
+    if (!typeSpec.InitializeFromIndex(*caller.genericType))
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+    }
+
+    CLR_RT_SignatureParser parser;
+    parser.Initialize_TypeSpec(typeSpec);
+
+    CLR_RT_SignatureParser::Element element;
+
+    if (FAILED(parser.Advance(element)))
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+    }
+
+    // The first element should be the generic type instantiation
+    if (element.DataType != DATATYPE_GENERICINST)
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+    }
+
+    // Advance to get the generic argument (T)
+    if (FAILED(parser.Advance(element)))
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+    }
+
+    if (element.DataType == DATATYPE_VALUETYPE)
+    {
+        // For value types we need to advance again
+        if (FAILED(parser.Advance(element)))
+        {
+            NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
+        }
+    }
+
+    // check if T is a reference type or contains references
+    NANOCLR_CHECK_HRESULT(
+        RuntimeHelpers::CheckReferenceOrContainsReferences(
+            element.Class,
+            element.DataType,
+            &parser,
+            isRefContainsRefs));
+
+    if (isRefContainsRefs)
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_INVALID_PARAMETER);
+    }
+
+    // validate length parameter
+    length = stack.Arg2().NumericByRefConst().s4;
+
+    if (length < 0)
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_OUT_OF_RANGE);
+    }
+
+    // get the pointer to the array
+    // validate data type as being an unmanaged pointer
+    if (stack.Arg1().DataType() != DATATYPE_PTR)
+    {
+        NANOCLR_SET_AND_LEAVE(CLR_E_INVALID_PARAMETER);
+    }
+
+    objectRawPointer = (uintptr_t)stack.Arg1().UnmanagedPointer();
+
+    {
+        CLR_RT_HeapBlock &refArray = thisSpan[FIELD___array];
+        NANOCLR_CHECK_HRESULT(
+            CLR_RT_HeapBlock_Array::CreateInstanceWithStorage(refArray, length, objectRawPointer, element.Class));
+    }
+
+    // set length
+    thisSpan[FIELD___length].NumericByRef().s4 = length;
+
+    NANOCLR_NOCLEANUP();
+}
+
 HRESULT Library_corlib_native_System_ReadOnlySpan_1::NativeReadOnlySpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4(
     CLR_RT_StackFrame &stack)
 {
@@ -16,37 +115,30 @@ HRESULT Library_corlib_native_System_ReadOnlySpan_1::NativeReadOnlySpanConstruct
 
     CLR_RT_TypeDescriptor descDst{};
     CLR_RT_TypeDef_Index sourceType{};
-    CLR_RT_HeapBlock_Array *destinationArray;
     CLR_RT_HeapBlock_Array *sourceArray = stack.Arg1().DereferenceArray();
     CLR_RT_HeapBlock *thisSpan = stack.This();
 
     // get working values
     start = stack.Arg2().NumericByRefConst().s4;
     length = stack.Arg3().NumericByRefConst().s4;
 
-    {
-        // get type of the source array
-        NANOCLR_CHECK_HRESULT(descDst.InitializeFromObject(*sourceArray));
-        descDst.GetElementType(descDst);
-
-        sourceType.data = descDst.m_handlerCls.data;
-
-        CLR_RT_HeapBlock &refArray = thisSpan[FIELD___array];
-        CLR_RT_HeapBlock_Array::CreateInstance(refArray, length, sourceType);
-
-        // get pointer to the array
-        destinationArray = thisSpan[FIELD___array].DereferenceArray();
+    // get type of the source array
+    NANOCLR_CHECK_HRESULT(descDst.InitializeFromObject(*sourceArray));
+    descDst.GetElementType(descDst);
 
-        // protect from GC
-        CLR_RT_ProtectFromGC gc1(*sourceArray);
-        CLR_RT_ProtectFromGC gc2(refArray);
+    sourceType.data = descDst.m_handlerCls.data;
 
-        // copy array
-        CLR_RT_HeapBlock_Array::Copy(sourceArray, start, destinationArray, 0, length);
+    {
+        // get the pointer to the element at start address
+        uintptr_t ptrToStartElement = (uintptr_t)sourceArray->GetElement(start);
 
-        // set length
-        thisSpan[FIELD___length].NumericByRef().s4 = length;
+        CLR_RT_HeapBlock &refArray = thisSpan[FIELD___array];
+        NANOCLR_CHECK_HRESULT(
+            CLR_RT_HeapBlock_Array::CreateInstanceWithStorage(refArray, length, ptrToStartElement, sourceType));
     }
 
+    // set length
+    thisSpan[FIELD___length].NumericByRef().s4 = length;
+
     NANOCLR_NOCLEANUP();
 }