More work on generics in interpreter and type system

CMake/Modules/FindNF_CoreCLR.cmake

@@ -106,11 +106,13 @@ set(NF_CoreCLR_SRCS
     corlib_native_System_Number.cpp
     corlib_native_System_Object.cpp
     corlib_native_System_Random.cpp
+    corlib_native_System_ReadOnlySpan_1.cpp
     corlib_native_System_Reflection_Binder.cpp
     corlib_native_System_Reflection_MemberInfo.cpp
     corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp
     corlib_native_System_Runtime_Remoting_RemotingServices.cpp
     corlib_native_System_String.cpp
+    corlib_native_System_Span_1.cpp
     corlib_native_System_Threading_AutoResetEvent.cpp
     corlib_native_System_Threading_Interlocked.cpp
     corlib_native_System_Threading_ManualResetEvent.cpp

src/CLR/CorLib/CorLib.vcxproj

@@ -48,6 +48,7 @@
     <ClCompile Include="corlib_native_System_Number.cpp" />
     <ClCompile Include="corlib_native_System_Object.cpp" />
     <ClCompile Include="corlib_native_System_Random.cpp" />
+    <ClCompile Include="corlib_native_System_ReadOnlySpan_1.cpp" />
     <ClCompile Include="corlib_native_System_Reflection_Assembly.cpp" />
     <ClCompile Include="corlib_native_System_Reflection_Binder.cpp" />
     <ClCompile Include="corlib_native_System_Reflection_ConstructorInfo.cpp" />
@@ -60,6 +61,7 @@
     <ClCompile Include="corlib_native_System_RuntimeType.cpp" />
     <ClCompile Include="corlib_native_System_Runtime_CompilerServices_RuntimeHelpers.cpp" />
     <ClCompile Include="corlib_native_System_Runtime_Remoting_RemotingServices.cpp" />
+    <ClCompile Include="corlib_native_System_Span_1.cpp" />
     <ClCompile Include="corlib_native_System_String.cpp" />
     <ClCompile Include="corlib_native_System_Threading_AutoResetEvent.cpp" />
     <ClCompile Include="corlib_native_System_Threading_Interlocked.cpp" />
@@ -208,4 +210,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

src/CLR/CorLib/CorLib.vcxproj.filters

@@ -173,5 +173,11 @@
     <ClCompile Include="corlib_native_System_Threading_SpinWait.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="corlib_native_System_Span_1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="corlib_native_System_ReadOnlySpan_1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

src/CLR/CorLib/corlib_native.cpp

@@ -56,6 +56,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Reflection_FieldInfo::GetCustomAttributesNative___SZARRAY_OBJECT__BOOLEAN,
     nullptr,
     Library_corlib_native_System_Type::get_DeclaringType___SystemType,
+    Library_corlib_native_System_Type::GetGenericTypeDefinition___SystemType,
     nullptr,
     nullptr,
     nullptr,
@@ -69,6 +70,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     Library_corlib_native_System_Type::IsInstanceOfType___BOOLEAN__OBJECT,
     nullptr,
+    Library_corlib_native_System_Type::GetGenericArguments___SZARRAY_SystemType,
     Library_corlib_native_System_Type::InvokeMember___OBJECT__STRING__SystemReflectionBindingFlags__SystemReflectionBinder__OBJECT__SZARRAY_OBJECT,
     Library_corlib_native_System_Type::GetConstructor___SystemReflectionConstructorInfo__SZARRAY_SystemType,
     Library_corlib_native_System_Type::GetConstructors___SZARRAY_SystemReflectionConstructorInfo,
@@ -86,6 +88,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Type::get_IsEnum___BOOLEAN,
     Library_corlib_native_System_Type::get_IsSerializable___BOOLEAN,
     Library_corlib_native_System_Type::get_IsArray___BOOLEAN,
+    Library_corlib_native_System_Type::get_IsGenericType___BOOLEAN,
+    Library_corlib_native_System_Type::get_IsGenericTypeDefinition___BOOLEAN,
     nullptr,
     nullptr,
     Library_corlib_native_System_Type::GetTypeInternal___STATIC__SystemType__STRING__STRING__BOOLEAN__SZARRAY_I4,
@@ -255,6 +259,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     Library_corlib_native_System_Array::TrySzIndexOf___STATIC__BOOLEAN__SystemArray__I4__I4__OBJECT__BYREF_I4,
     nullptr,
     nullptr,
@@ -269,6 +274,10 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     Library_corlib_native_System_BitConverter::get_IsLittleEndian___STATIC__BOOLEAN,
     Library_corlib_native_System_BitConverter::DoubleToInt64Bits___STATIC__I8__R8,
     Library_corlib_native_System_BitConverter::GetBytes___STATIC__SZARRAY_U1__BOOLEAN,
@@ -524,6 +533,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_corlib_native_System_Reflection_Assembly::LoadInternal___STATIC__SystemReflectionAssembly__STRING__BOOLEAN__I4__I4__I4__I4,
     Library_corlib_native_System_Reflection_Assembly::Load___STATIC__SystemReflectionAssembly__SZARRAY_U1,
     nullptr,
+    nullptr,
     Library_corlib_native_System_Enum::HasFlag___BOOLEAN__SystemEnum,
     nullptr,
     nullptr,
@@ -625,6 +635,18 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     Library_corlib_native_System_Number::FormatNative___STATIC__STRING__OBJECT__BOOLEAN__STRING__STRING__STRING__STRING__SZARRAY_I4,
     nullptr,
     nullptr,
@@ -645,6 +667,16 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    Library_corlib_native_System_ReadOnlySpan_1::NativeReadOnlySpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4,
+    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,
@@ -691,10 +723,12 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    nullptr,
     Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
     Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
     Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
     Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::get_OffsetToStringData___STATIC__I4,
+    nullptr,
     Library_corlib_native_System_Runtime_Remoting_RemotingServices::IsTransparentProxy___STATIC__BOOLEAN__OBJECT,
     nullptr,
     nullptr,
@@ -734,6 +768,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     nullptr,
+    Library_corlib_native_System_Span_1::CopyTo___VOID__SystemSpan_1,
+    nullptr,
+    nullptr,
+    nullptr,
+    Library_corlib_native_System_Span_1::NativeSpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4,
+    nullptr,
+    nullptr,
     nullptr,
     nullptr,
     nullptr,
@@ -1507,7 +1548,7 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
 
 #if (NANOCLR_REFLECTION == TRUE)
 
-    0x50BF350D,
+    0x17B85422,
 
 #elif (NANOCLR_REFLECTION == FALSE)
 

src/CLR/CorLib/corlib_native.h

@@ -91,8 +91,10 @@ struct Library_corlib_native_System_Reflection_FieldInfo
 struct Library_corlib_native_System_Type
 {
     NANOCLR_NATIVE_DECLARE(get_DeclaringType___SystemType);
+    NANOCLR_NATIVE_DECLARE(GetGenericTypeDefinition___SystemType);
     NANOCLR_NATIVE_DECLARE(GetMethod___SystemReflectionMethodInfo__STRING__SystemReflectionBindingFlags);
     NANOCLR_NATIVE_DECLARE(IsInstanceOfType___BOOLEAN__OBJECT);
+    NANOCLR_NATIVE_DECLARE(GetGenericArguments___SZARRAY_SystemType);
     NANOCLR_NATIVE_DECLARE(
         InvokeMember___OBJECT__STRING__SystemReflectionBindingFlags__SystemReflectionBinder__OBJECT__SZARRAY_OBJECT);
     NANOCLR_NATIVE_DECLARE(GetConstructor___SystemReflectionConstructorInfo__SZARRAY_SystemType);
@@ -108,6 +110,8 @@ struct Library_corlib_native_System_Type
     NANOCLR_NATIVE_DECLARE(get_IsEnum___BOOLEAN);
     NANOCLR_NATIVE_DECLARE(get_IsSerializable___BOOLEAN);
     NANOCLR_NATIVE_DECLARE(get_IsArray___BOOLEAN);
+    NANOCLR_NATIVE_DECLARE(get_IsGenericType___BOOLEAN);
+    NANOCLR_NATIVE_DECLARE(get_IsGenericTypeDefinition___BOOLEAN);
     NANOCLR_NATIVE_DECLARE(GetTypeInternal___STATIC__SystemType__STRING__STRING__BOOLEAN__SZARRAY_I4);
     NANOCLR_NATIVE_DECLARE(GetTypeFromHandle___STATIC__SystemType__SystemRuntimeTypeHandle);
 
@@ -697,6 +701,14 @@ struct Library_corlib_native_System_MulticastDelegate
     //--//
 };
 
+struct Library_corlib_native_System_Nullable_1
+{
+    static const int FIELD__hasValue = 1;
+    static const int FIELD__value = 2;
+
+    //--//
+};
+
 struct Library_corlib_native_System_Number
 {
     NANOCLR_NATIVE_DECLARE(FormatNative___STATIC__STRING__OBJECT__BOOLEAN__STRING__STRING__STRING__STRING__SZARRAY_I4);
@@ -764,6 +776,20 @@ struct Library_corlib_native_System_Random
     static HRESULT GetRandom(CLR_RT_StackFrame &stack, CLR_RT_Random *&rand, bool create = false);
 };
 
+#if (NANOCLR_REFLECTION == TRUE)
+
+struct Library_corlib_native_System_ReadOnlySpan_1
+{
+    static const int FIELD___array = 1;
+    static const int FIELD___length = 2;
+
+    NANOCLR_NATIVE_DECLARE(NativeReadOnlySpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4);
+
+    //--//
+};
+
+#endif // NANOCLR_REFLECTION
+
 struct Library_corlib_native_System_Reflection_AssemblyName
 {
     static const int FIELD___assembly = 1;
@@ -910,6 +936,23 @@ struct Library_corlib_native_System_Single
     //--//
 };
 
+#if (NANOCLR_REFLECTION == TRUE)
+
+struct Library_corlib_native_System_Span_1
+{
+    static const int FIELD___array = 1;
+    static const int FIELD___length = 2;
+
+    NANOCLR_NATIVE_DECLARE(CopyTo___VOID__SystemSpan_1);
+    NANOCLR_NATIVE_DECLARE(NativeSpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4);
+
+    //--//
+};
+
+#endif // NANOCLR_REFLECTION
+
+#if (NANOCLR_REFLECTION != TRUE)
+
 struct Library_corlib_native_System_SpanByte
 {
     static const int FIELD___array = 1;
@@ -919,6 +962,8 @@ struct Library_corlib_native_System_SpanByte
     //--//
 };
 
+#endif // NANOCLR_REFLECTION
+
 struct Library_corlib_native_System_Threading_AutoResetEvent
 {
     NANOCLR_NATIVE_DECLARE(_ctor___VOID__BOOLEAN);

src/CLR/CorLib/corlib_native_System_ReadOnlySpan_1.cpp

@@ -0,0 +1,52 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
+// See LICENSE file in the project root for full license information.
+//
+
+#include "CorLib.h"
+
+HRESULT Library_corlib_native_System_ReadOnlySpan_1::NativeReadOnlySpanConstructor___VOID__SZARRAY_GENERICTYPE__I4__I4(
+    CLR_RT_StackFrame &stack)
+{
+    NANOCLR_HEADER();
+
+    int32_t start;
+    int32_t length;
+
+    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();
+
+        // protect from GC
+        CLR_RT_ProtectFromGC gc1(*sourceArray);
+        CLR_RT_ProtectFromGC gc2(refArray);
+
+        // copy array
+        CLR_RT_HeapBlock_Array::Copy(sourceArray, start, destinationArray, 0, length);
+
+        // set length
+        thisSpan[FIELD___length].NumericByRef().s4 = length;
+    }
+
+    NANOCLR_NOCLEANUP();
+}