Remove the concept of primitive value types and follow-up JIT/TypedReference/arglist cleanup

docs/design/datacontracts/RuntimeTypeSystem.md

@@ -312,7 +312,7 @@ internal partial struct RuntimeTypeSystem_1
         Category_Array = 0x00080000,
         Category_ValueType = 0x00040000,
         Category_Nullable = 0x00050000,
-        Category_PrimitiveValueType = 0x00060000,
+        Category_Primitive = 0x00060000,
         Category_TruePrimitive = 0x00070000,
         Category_Interface = 0x000C0000,
         Collectible = 0x00200000,
@@ -837,7 +837,7 @@ Contracts used:
                     return CorElementType.SzArray;
                 case WFLAGS_HIGH.Category_ValueType:
                 case WFLAGS_HIGH.Category_Nullable:
-                case WFLAGS_HIGH.Category_PrimitiveValueType:
+                case WFLAGS_HIGH.Category_Primitive:
                     return CorElementType.ValueType;
                 case WFLAGS_HIGH.Category_TruePrimitive:
                     return (CorElementType)GetClassData(typeHandle).InternalCorElementType;
@@ -872,20 +872,16 @@ Contracts used:
         // if typedesc: check for CorElementType.ValueType
     }
 
-    // Enums have Category_PrimitiveValueType in their MethodTable flags and their
+    // Enums have Category_Primitive in their MethodTable flags and their
     // InternalCorElementType is a primitive type (I1, U1, I2, U2, I4, U4, I8, U8),
-    // not ValueType. Regular primitive value types (IntPtr/UIntPtr) have Category_TruePrimitive.
+    // not ValueType. Regular primitive value types (Int32, etc.) have Category_TruePrimitive.
     public bool IsEnum(TypeHandle typeHandle)
     {
         if (!typeHandle.IsMethodTable())
             return false;
 
-        CorElementType sigType = GetSignatureCorElementType(typeHandle);
-        if (sigType != CorElementType.ValueType)
-            return false;
-
-        CorElementType internalType = (CorElementType)GetClassData(typeHandle).InternalCorElementType;
-        return internalType != CorElementType.ValueType;
+        MethodTable methodTable = _methodTables[typeHandle.Address];
+        return methodTable.Flags.GetFlag(WFLAGS_HIGH.Category_Mask) == WFLAGS_HIGH.Category_Primitive;
     }
 
     // return true if the TypeHandle represents an array, and set the rank to either 0 (if the type is not an array), or the rank number if it is.

src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs

@@ -849,9 +849,9 @@ internal unsafe struct MethodTable
         private const uint enum_flag_Category_Mask = 0x000F0000;
         private const uint enum_flag_Category_ValueType = 0x00040000;
         private const uint enum_flag_Category_Nullable = 0x00050000;
-        private const uint enum_flag_Category_IsPrimitiveMask = 0x000E0000;
-        private const uint enum_flag_Category_PrimitiveValueType = 0x00060000; // sub-category of ValueType, Enum or primitive value type
-        private const uint enum_flag_Category_TruePrimitive = 0x00070000; // sub-category of ValueType, Primitive (ELEMENT_TYPE_I, etc.)
+        private const uint enum_flag_Category_ElementTypeMask = 0x000E0000;
+        private const uint enum_flag_Category_Primitive = 0x00060000;
+        private const uint enum_flag_Category_TruePrimitive = 0x00070000;
         private const uint enum_flag_Category_Array = 0x00080000;
         private const uint enum_flag_Category_Array_Mask = 0x000C0000;
         private const uint enum_flag_Category_ValueType_Mask = 0x000C0000;
@@ -955,7 +955,7 @@ public int MultiDimensionalArrayRank
         public bool IsByRefLike => (Flags & (enum_flag_HasComponentSize | enum_flag_IsByRefLike)) == enum_flag_IsByRefLike;
 
         // Warning! UNLIKE the similarly named Reflection api, this method also returns "true" for Enums.
-        public bool IsPrimitive => (Flags & enum_flag_Category_IsPrimitiveMask) == enum_flag_Category_PrimitiveValueType;
+        public bool IsPrimitive => (Flags & enum_flag_Category_ElementTypeMask) == enum_flag_Category_Primitive;
 
         public bool IsTruePrimitive => (Flags & enum_flag_Category_Mask) is enum_flag_Category_TruePrimitive;
 

src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

@@ -942,12 +942,12 @@ internal sealed class RuntimeMethodInfoStub : IRuntimeMethodInfo
         public RuntimeMethodInfoStub(RuntimeMethodHandleInternal methodHandleValue, object keepalive)
         {
             m_keepalive = keepalive;
-            m_value = methodHandleValue;
+            m_value = methodHandleValue.Value;
         }
 
         private readonly object m_keepalive;
 
-        // These unused variables are used to ensure that this class has the same layout as RuntimeMethodInfo
+        // These unused variables are used to ensure that m_value has same offset as RuntimeMethodInfo.m_handle
 #pragma warning disable CA1823, 414, 169, IDE0044
         private object? m_a;
         private object? m_b;
@@ -959,9 +959,9 @@ public RuntimeMethodInfoStub(RuntimeMethodHandleInternal methodHandleValue, obje
         private object? m_h;
 #pragma warning restore CA1823, 414, 169, IDE0044
 
-        public RuntimeMethodHandleInternal m_value;
+        private IntPtr m_value;
 
-        RuntimeMethodHandleInternal IRuntimeMethodInfo.Value => m_value;
+        RuntimeMethodHandleInternal IRuntimeMethodInfo.Value => new RuntimeMethodHandleInternal(m_value);
 
         // implementation of CORINFO_HELP_METHODDESC_TO_STUBRUNTIMEMETHOD
         [StackTraceHidden]
@@ -1411,28 +1411,28 @@ RuntimeFieldHandleInternal Value
         }
     }
 
-    [StructLayout(LayoutKind.Sequential)]
     internal sealed class RuntimeFieldInfoStub : IRuntimeFieldInfo
     {
         public RuntimeFieldInfoStub(RuntimeFieldHandleInternal fieldHandle, object keepalive)
         {
             m_keepalive = keepalive;
-            m_fieldHandle = fieldHandle;
+            m_fieldHandle = fieldHandle.Value;
         }
 
         private readonly object m_keepalive;
 
-        // These unused variables are used to ensure that this class has the same layout as RuntimeFieldInfo
-#pragma warning disable 414, 169, IDE0044
+        // These unused variables are used to ensure that m_fieldHandle has same offset as RtFieldInfo.m_fieldHandle
+#pragma warning disable CA1823, 414, 169, IDE0044
+        private IntPtr m_b;
         private object? m_c;
         private object? m_d;
-        private int m_b;
         private object? m_e;
         private object? m_f;
-        private RuntimeFieldHandleInternal m_fieldHandle;
-#pragma warning restore 414, 169, IDE0044
+#pragma warning restore CA1823, 414, 169, IDE0044
+
+        private IntPtr m_fieldHandle;
 
-        RuntimeFieldHandleInternal IRuntimeFieldInfo.Value => m_fieldHandle;
+        RuntimeFieldHandleInternal IRuntimeFieldInfo.Value => new RuntimeFieldHandleInternal(m_fieldHandle);
 
         // implementation of CORINFO_HELP_FIELDDESC_TO_STUBRUNTIMEFIELD
         [StackTraceHidden]

src/coreclr/jit/importer.cpp

@@ -6991,7 +6991,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
                 break;
 
             case CEE_ARGLIST:
-
+            {
                 if (!info.compIsVarArgs)
                 {
                     BADCODE("arglist in non-vararg method");
@@ -7002,9 +7002,19 @@ void Compiler::impImportBlockCode(BasicBlock* block)
                 // The ARGLIST cookie is a hidden 'last' parameter, we have already
                 // adjusted the arg count cos this is like fetching the last param.
                 assertImp(numArgs > 0);
-                op1 = gtNewLclVarAddrNode(lvaVarargsHandleArg, TYP_BYREF);
+                clsHnd = impGetRuntimeArgumentHandle();
+
+                unsigned argListTmp = lvaGrabTemp(false DEBUGARG("arglist tmp"));
+                lvaSetStruct(argListTmp, clsHnd, false);
+
+                op1 = gtNewLclVarAddrNode(lvaVarargsHandleArg, TYP_I_IMPL);
+                impAppendTree(gtNewStoreLclFldNode(argListTmp, TYP_I_IMPL, 0, op1), CHECK_SPILL_ALL, impCurStmtDI);
+
+                op1      = gtNewLclVarNode(argListTmp, TYP_STRUCT);
+                tiRetVal = makeTypeInfo(clsHnd);
                 impPushOnStack(op1, tiRetVal);
                 break;
+            }
 
             case CEE_ENDFINALLY:
 

src/coreclr/vm/arraynative.cpp

@@ -24,7 +24,7 @@ FCIMPL1(INT32, ArrayNative::GetCorElementTypeOfElementType, ArrayBase* arrayUNSA
 
     _ASSERTE(arrayUNSAFE != NULL);
 
-    return arrayUNSAFE->GetArrayElementTypeHandle().GetVerifierCorElementType();
+    return arrayUNSAFE->GetArrayElementTypeHandle().GetInternalCorElementType();
 }
 FCIMPLEND
 

src/coreclr/vm/callingconvention.h

@@ -2447,7 +2447,7 @@ inline BOOL HasRetBuffArgUnmanagedFixup(MetaSig * pSig)
 {
     WRAPPER_NO_CONTRACT;
     // We cannot just pSig->GetReturnType() here since it will return ELEMENT_TYPE_VALUETYPE for enums
-    CorElementType type = pSig->GetRetTypeHandleThrowing().GetVerifierCorElementType();
+    CorElementType type = pSig->GetRetTypeHandleThrowing().GetInternalCorElementType();
     return type == ELEMENT_TYPE_VALUETYPE;
 }
 #endif

src/coreclr/vm/class.cpp

@@ -1318,7 +1318,7 @@ void ClassLoader::LoadExactParents(MethodTable* pMT)
 /*static*/
 CorElementType ClassLoader::GetReducedTypeElementType(TypeHandle hType)
 {
-    CorElementType elemType = hType.GetVerifierCorElementType();
+    CorElementType elemType = hType.GetInternalCorElementType();
     switch (elemType)
     {
         case ELEMENT_TYPE_U1:

src/coreclr/vm/classnames.h

@@ -11,25 +11,14 @@
 // These system class names are not assembly qualified.
 
 #define g_AppDomainClassName "System.AppDomain"
-#define g_ArgIteratorName "ArgIterator"
 #define g_ArrayClassName "System.Array"
 
 #define g_NullableName "Nullable`1"
 
-#define g_CollectionsEnumerableItfName "System.Collections.IEnumerable"
 #define g_CollectionsEnumeratorClassName "System.Collections.IEnumerator"
-#define g_CollectionsCollectionItfName "System.Collections.ICollection"
-#define g_CollectionsGenericCollectionItfName "System.Collections.Generic.ICollection`1"
-#define g_CollectionsGenericReadOnlyCollectionItfName "System.Collections.Generic.IReadOnlyCollection`1"
 
 #ifdef FEATURE_COMINTEROP
-#define g_CorelibAsmName "System.Private.CoreLib"
-#define g_SystemAsmName "System"
-#define g_SystemRuntimeAsmName "System.Runtime"
-#define g_DrawingAsmName "System.Drawing"
-#define g_ObjectModelAsmName "System.ObjectModel"
 #define g_ColorClassName "System.Drawing.Color"
-#define g_ColorTranslatorClassName "System.Drawing.ColorTranslator"
 #define g_ComObjectName "__ComObject"
 #endif // FEATURE_COMINTEROP
 
@@ -55,51 +44,16 @@
 #define g_Vector512ClassName "System.Runtime.Intrinsics.Vector512`1"
 #define g_Vector512Name "Vector512`1"
 
-#define g_EnumeratorToEnumClassName "System.Runtime.InteropServices.CustomMarshalers.EnumeratorToEnumVariantMarshaler"
-#define g_ExceptionClassName "System.Exception"
-#define g_ExecutionEngineExceptionClassName "System.ExecutionEngineException"
-
-#define g_ThreadStaticAttributeClassName "System.ThreadStaticAttribute"
-#define g_TypeIdentifierAttributeClassName "System.Runtime.InteropServices.TypeIdentifierAttribute"
-
 #define g_ObjectClassName "System.Object"
-#define g_ObjectName "Object"
-#define g_OutOfMemoryExceptionClassName "System.OutOfMemoryException"
-
-#define g_ReflectionClassName "System.RuntimeType"
-#define g_ReflectionConstructorName "System.Reflection.RuntimeConstructorInfo"
-#define g_ReflectionEventInfoName "System.Reflection.EventInfo"
-#define g_ReflectionEventName "System.Reflection.RuntimeEventInfo"
-#define g_ReflectionFieldName "System.Reflection.RuntimeFieldInfo"
-#define g_ReflectionMemberInfoName "System.Reflection.MemberInfo"
-#define g_MethodBaseName "System.Reflection.MethodBase"
-#define g_ReflectionFieldInfoName "System.Reflection.FieldInfo"
-#define g_ReflectionPropertyInfoName "System.Reflection.PropertyInfo"
-#define g_ReflectionConstructorInfoName "System.Reflection.ConstructorInfo"
-#define g_ReflectionMethodInfoName "System.Reflection.MethodInfo"
-#define g_ReflectionMethodName "System.Reflection.RuntimeMethodInfo"
-#define g_ReflectionMethodInterfaceName "System.IRuntimeMethodInfo"
-#define g_ReflectionAssemblyName "System.Reflection.RuntimeAssembly"
-#define g_ReflectionModuleName "System.Reflection.RuntimeModule"
-#define g_ReflectionParamInfoName "System.Reflection.ParameterInfo"
-#define g_ReflectionParamName "System.Reflection.RuntimeParameterInfo"
-#define g_ReflectionPropInfoName "System.Reflection.RuntimePropertyInfo"
-#define g_RuntimeArgumentHandleName      "RuntimeArgumentHandle"
+
 #define g_RuntimeFieldHandleClassName    "System.RuntimeFieldHandle"
-#define g_RuntimeFieldHandleInternalName        "RuntimeFieldHandleInternal"
 #define g_RuntimeMethodHandleClassName   "System.RuntimeMethodHandle"
-#define g_RuntimeMethodHandleInternalName        "RuntimeMethodHandleInternal"
 #define g_RuntimeTypeHandleClassName     "System.RuntimeTypeHandle"
 
-#define g_StackOverflowExceptionClassName "System.StackOverflowException"
 #define g_StringBufferClassName "System.Text.StringBuilder"
-#define g_StringBufferName "StringBuilder"
 #define g_StringClassName "System.String"
 #define g_StringName "String"
 
-#define g_ThreadClassName "System.Threading.Thread"
-#define g_TypeClassName   "System.Type"
-
 #define g_VariantClassName "System.Variant"
 #define g_GuidClassName "System.Guid"
 

src/coreclr/vm/comdelegate.cpp

@@ -2511,7 +2511,7 @@ static bool IsLocationAssignable(TypeHandle fromHandle, TypeHandle toHandle, boo
     else
     {
         // they are not compatible yet enums can go into each other if their underlying element type is the same
-        if (toHandle.GetVerifierCorElementType() == fromHandle.GetVerifierCorElementType()
+        if (toHandle.GetInternalCorElementType() == fromHandle.GetInternalCorElementType()
             && (toHandle.IsEnum() || fromHandle.IsEnum()))
             return true;
 

src/coreclr/vm/comutilnative.cpp

@@ -1977,7 +1977,7 @@ FCIMPL1(CorElementType, MethodTableNative::GetPrimitiveCorElementType, MethodTab
 {
     FCALL_CONTRACT;
 
-    _ASSERTE(mt->IsTruePrimitive() || mt->IsEnum());
+    _ASSERTE(mt->IsPrimitive());
 
     // MethodTable::GetInternalCorElementType has unnecessary overhead for primitives and enums
     // Call EEClass::GetInternalCorElementType directly to avoid it

src/coreclr/vm/corelib.h

@@ -104,7 +104,6 @@ DEFINE_METHOD(APPCONTEXT,   ON_FIRST_CHANCE_EXCEPTION,  OnFirstChanceException,
 
 DEFINE_CLASS(ARG_ITERATOR,          System,                 ArgIterator)
 DEFINE_CLASS_U(System,              ArgIterator,            VARARGS)  // Includes a SigPointer.
-DEFINE_METHOD(ARG_ITERATOR,         CTOR2,                  .ctor,                      IM_RuntimeArgumentHandle_PtrVoid_RetVoid)
 
 DEFINE_CLASS(ARGUMENT_HANDLE,       System,                 RuntimeArgumentHandle)
 
@@ -206,7 +205,10 @@ DEFINE_CLASS_U(System,                 RuntimeMethodInfoStub,     ReflectMethodO
 DEFINE_FIELD_U(m_value,                   ReflectMethodObject, m_pMD)
 DEFINE_CLASS(STUBMETHODINFO,      System,                 RuntimeMethodInfoStub)
 DEFINE_FIELD(STUBMETHODINFO,      HANDLE,                 m_value)
-DEFINE_METHOD(STUBMETHODINFO,     FROMPTR,                FromPtr,                     SM_IntPtr_RetObj)
+DEFINE_METHOD(STUBMETHODINFO,     FROMPTR,                FromPtr,                      SM_IntPtr_RetObj)
+#ifdef FOR_ILLINK
+DEFINE_METHOD(STUBMETHODINFO,       CTOR,                   .ctor,                      IM_RetVoid)
+#endif // FOR_ILLINK
 
 DEFINE_CLASS(CONSTRUCTOR_INFO,      Reflection,             ConstructorInfo)
 
@@ -361,12 +363,12 @@ DEFINE_METHOD(TYPE_NAME_RESOLVER,   GET_TYPE_HELPER,        GetTypeHelper,
 DEFINE_CLASS_U(Reflection,          RtFieldInfo,            NoClass)
 DEFINE_FIELD_U(m_fieldHandle,       ReflectFieldObject,     m_pFD)
 DEFINE_CLASS(RT_FIELD_INFO,         Reflection,             RtFieldInfo)
-DEFINE_FIELD(RT_FIELD_INFO,         HANDLE,                 m_fieldHandle)
 
 DEFINE_CLASS_U(System,              RuntimeFieldInfoStub,   ReflectFieldObject)
 DEFINE_FIELD_U(m_fieldHandle,       ReflectFieldObject,     m_pFD)
 DEFINE_CLASS(STUBFIELDINFO,         System,                 RuntimeFieldInfoStub)
-DEFINE_METHOD(STUBFIELDINFO,        FROMPTR,                FromPtr,                     SM_IntPtr_RetObj)
+DEFINE_FIELD(STUBFIELDINFO,         HANDLE,                 m_fieldHandle)
+DEFINE_METHOD(STUBFIELDINFO,        FROMPTR,                FromPtr,                    SM_IntPtr_RetObj)
 #ifdef FOR_ILLINK
 DEFINE_METHOD(STUBFIELDINFO,        CTOR,                   .ctor,                      IM_RetVoid)
 #endif // FOR_ILLINK
@@ -563,8 +565,6 @@ DEFINE_METHOD(RUNTIME_METHOD_BODY,  CTOR,   .ctor,  IM_RetVoid)
 
 DEFINE_CLASS(METHOD_INFO,           Reflection,             MethodInfo)
 
-DEFINE_CLASS(METHOD_HANDLE_INTERNAL,System,                 RuntimeMethodHandleInternal)
-
 DEFINE_CLASS(METHOD_HANDLE,         System,                 RuntimeMethodHandle)
 DEFINE_FIELD(METHOD_HANDLE,         METHOD,                 m_value)
 DEFINE_METHOD(METHOD_HANDLE,        TO_INTPTR,              ToIntPtr,           SM_RuntimeMethodHandle_RetIntPtr)

src/coreclr/vm/customattribute.cpp

@@ -52,7 +52,7 @@ static HRESULT ParseCaType(
 
         if (!th.IsNull() && th.IsEnum())
         {
-            pCaType->enumType = (CorSerializationType)th.GetVerifierCorElementType();
+            pCaType->enumType = (CorSerializationType)th.GetInternalCorElementType();
 
             // The assembly qualified name of th might not equal pCaType->szEnumName.
             // e.g. th could be "MyEnum, MyAssembly, Version=4.0.0.0" while

src/coreclr/vm/ilmarshalers.cpp

@@ -3868,9 +3868,7 @@ bool ILNativeArrayMarshaler::CanMarshalViaPinning()
 
     TypeHandle elementTypeHandle = m_pargs->na.m_pArrayMT->GetArrayElementTypeHandle();
 
-    return elementTypeHandle.IsBlittable()
-        && (elementTypeHandle.GetMethodTable()->IsValueType()
-            || elementTypeHandle.GetMethodTable()->IsTruePrimitive());
+    return elementTypeHandle.IsBlittable() && elementTypeHandle.GetMethodTable()->IsValueType();
 }
 
 void ILNativeArrayMarshaler::EmitMarshalViaPinning(ILCodeStream* pslILEmit)

src/coreclr/vm/ilmarshalers.h

@@ -1975,7 +1975,7 @@ class ILRuntimeFieldHandleMarshaler : public ILReflectionObjectMarshaler
 {
 protected:
     BinderFieldID GetStructureFieldID() override { LIMITED_METHOD_CONTRACT; return FIELD__FIELD_HANDLE__M_FIELD; }
-    BinderFieldID GetObjectFieldID() override { LIMITED_METHOD_CONTRACT; return FIELD__RT_FIELD_INFO__HANDLE; }
+    BinderFieldID GetObjectFieldID() override { LIMITED_METHOD_CONTRACT; return FIELD__STUBFIELDINFO__HANDLE; }
     BinderClassID GetManagedTypeBinderID() override { LIMITED_METHOD_CONTRACT; return CLASS__FIELD_HANDLE; }
 };
 

src/coreclr/vm/invokeutil.cpp

@@ -135,7 +135,7 @@ void InvokeUtil::CopyArg(TypeHandle th, PVOID argRef, ArgDestination *argDest) {
     CONTRACTL_END;
 
     void *pArgDst = argDest->GetDestinationAddress();
-    CorElementType type = th.GetVerifierCorElementType();
+    CorElementType type = th.GetInternalCorElementType();
 
     switch (type) {
 #ifdef TARGET_RISCV64
@@ -500,7 +500,7 @@ void InvokeUtil::ValidField(TypeHandle th, OBJECTREF* value)
             if (th.IsEnum())
                 COMPlusThrow(kArgumentException,W("Arg_ObjObj"));
 
-            type = th.GetVerifierCorElementType();
+            type = th.GetInternalCorElementType();
             if (IsPrimitiveType(type))
             {
                 if (CanPrimitiveWiden(type, oType))