From 5bfdb4e0e80bf1edb5f71775cafa7b4346bb0c2b Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 6 Aug 2025 06:30:34 -0700 Subject: [PATCH] Delete CorElementType special case in the type loader --- src/coreclr/vm/classnames.h | 3 --- src/coreclr/vm/methodtablebuilder.cpp | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/src/coreclr/vm/classnames.h b/src/coreclr/vm/classnames.h index 81160ea4ff683e..43d56036dc031b 100644 --- a/src/coreclr/vm/classnames.h +++ b/src/coreclr/vm/classnames.h @@ -84,11 +84,8 @@ #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" diff --git a/src/coreclr/vm/methodtablebuilder.cpp b/src/coreclr/vm/methodtablebuilder.cpp index 7d581ac8b79f90..1813fdad56029f 100644 --- a/src/coreclr/vm/methodtablebuilder.cpp +++ b/src/coreclr/vm/methodtablebuilder.cpp @@ -10456,18 +10456,6 @@ void MethodTableBuilder::CheckForSystemTypes() { pMT->SetIsNullable(); } - else if (strcmp(name, g_RuntimeArgumentHandleName) == 0) - { - pMT->SetInternalCorElementType (ELEMENT_TYPE_I); - } - else if (strcmp(name, g_RuntimeMethodHandleInternalName) == 0) - { - pMT->SetInternalCorElementType (ELEMENT_TYPE_I); - } - else if (strcmp(name, g_RuntimeFieldHandleInternalName) == 0) - { - pMT->SetInternalCorElementType (ELEMENT_TYPE_I); - } else if ((strcmp(name, g_Int128Name) == 0) || (strcmp(name, g_UInt128Name) == 0)) { EEClassLayoutInfo* pLayout = pClass->GetLayoutInfo();