Remove IsClass and IsPrimitive

src/coreclr/src/ToolBox/superpmi/superpmi-shim-collector/icorjitcompiler.cpp

@@ -47,8 +47,6 @@ CorJitResult __stdcall interceptor_ICJC::compileMethod(ICorJitInfo*
  our_ICorJitInfo.getBuiltinClass(CLASSID_STRING);
  our_ICorJitInfo.getBuiltinClass(CLASSID_ARGUMENT_HANDLE);
  our_ICorJitInfo.getBuiltinClass(CLASSID_RUNTIME_TYPE);
- our_ICorJitInfo.getBuiltinClass(CLASSID_ENUM);
- our_ICorJitInfo.getBuiltinClass(CLASSID___CANON);
 
 #ifdef fatMC
  // to build up a fat mc

src/coreclr/src/inc/corinfo.h

@@ -1012,8 +1012,6 @@ enum CorInfoClassId
  CLASSID_STRING,
  CLASSID_ARGUMENT_HANDLE,
  CLASSID_RUNTIME_TYPE,
- CLASSID_ENUM,
- CLASSID___CANON,
 };
 
 enum CorInfoInline

src/coreclr/src/jit/importer.cpp

@@ -4015,15 +4015,12 @@ GenTree* Compiler::impIntrinsic(GenTree* newobjThis,
  break;
  }
 
- case NI_System_Type_get_IsClass:
- case NI_System_Type_get_IsPrimitive:
  case NI_System_Type_get_IsValueType:
  {
- // Optimize things like
+ // Optimize
  //
- // ldtoken [Type]
  // call Type.GetTypeFromHandle (which is replaced with CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE)
- // call Type.IsValueType (also IsClass and IsPrimitive)
+ // call Type.IsValueType
  //
  // to `true` or `false`
  // e.g. `typeof(int).IsValueType` => `true`
@@ -4033,51 +4030,13 @@ GenTree* Compiler::impIntrinsic(GenTree* newobjThis,
  if (call->gtCallMethHnd == eeFindHelper(CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE))
  {
  CORINFO_CLASS_HANDLE hClass = gtGetHelperArgClassHandle(call->gtCallArgs->GetNode());
- if (hClass == NO_CLASS_HANDLE || hClass == info.compCompHnd->getBuiltinClass(CLASSID___CANON))
+ if (hClass != NO_CLASS_HANDLE)
  {
- // Ignore System.__Canon
- break;
- }
-
- BOOL isValueType = eeIsValueClass(hClass);
- CorInfoType cit = info.compCompHnd->getTypeForPrimitiveValueClass(hClass);
- if (ni == NI_System_Type_get_IsPrimitive)
- {
- if (isValueType && (cit >= CORINFO_TYPE_BOOL) && (cit <= CORINFO_TYPE_DOUBLE))
- {
- // Enums are not primitive types
- BOOL isEnum = info.compCompHnd->getBuiltinClass(CLASSID_ENUM) ==
- info.compCompHnd->getParentType(hClass);
- retNode = gtNewIconNode(!isEnum ? 1 : 0);
- }
- else
- {
- retNode = gtNewIconNode(0);
- }
- }
- else if (ni == NI_System_Type_get_IsClass)
- {
- // Pointers are also classes (e.g. typeof(int*).IsClass is true)
- if (isValueType && (cit != CORINFO_TYPE_PTR))
- {
- retNode = gtNewIconNode(0);
- }
- else
- {
- BOOL isInterface = info.compCompHnd->getClassAttribs(hClass) & CORINFO_FLG_INTERFACE;
- retNode = gtNewIconNode(isInterface ? 0 : 1);
- }
+ retNode = gtNewIconNode((eeIsValueClass(hClass) &&
+ // pointers are not value types (e.g. typeof(int*).IsValueType is false)
+ info.compCompHnd->getTypeForPrimitiveValueClass(hClass) != CORINFO_TYPE_PTR) ? 1 : 0);
+ impPopStack(); // drop CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE call
  }
- else if (ni == NI_System_Type_get_IsValueType)
- {
- retNode = gtNewIconNode((isValueType && (cit != CORINFO_TYPE_PTR)) ? 1 : 0);
- }
- else
- {
- assert(false);
- }
- // drop CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE call
- impPopStack();
  }
  }
  break;
@@ -4380,14 +4339,6 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
  {
  result = NI_System_Type_get_IsValueType;
  }
- else if (strcmp(methodName, "get_IsClass") == 0)
- {
- result = NI_System_Type_get_IsClass;
- }
- else if (strcmp(methodName, "get_IsPrimitive") == 0)
- {
- result = NI_System_Type_get_IsPrimitive;
- }
  }
  }
 #if defined(_TARGET_XARCH_) // We currently only support BSWAP on x86

src/coreclr/src/jit/namedintrinsiclist.h

@@ -20,8 +20,6 @@ enum NamedIntrinsic : unsigned short
  NI_System_Buffers_Binary_BinaryPrimitives_ReverseEndianness,
  NI_System_GC_KeepAlive,
  NI_System_Type_get_IsValueType,
- NI_System_Type_get_IsClass,
- NI_System_Type_get_IsPrimitive,
 
 #ifdef FEATURE_HW_INTRINSICS
  NI_IsSupported_True,

src/coreclr/src/tools/Common/JitInterface/CorInfoImpl.cs

@@ -1689,12 +1689,6 @@ private CorInfoInitClassResult initClass(CORINFO_FIELD_STRUCT_* field, CORINFO_M
  TypeDesc typeOfRuntimeType = _compilation.GetTypeOfRuntimeType();
  return typeOfRuntimeType != null ? ObjectToHandle(typeOfRuntimeType) : null;
 
- case CorInfoClassId.CLASSID_ENUM:
- return ObjectToHandle(_compilation.TypeSystemContext.GetWellKnownType(WellKnownType.Enum));
-
- case CorInfoClassId.CLASSID___CANON:
- return ObjectToHandle(_compilation.TypeSystemContext.GetWellKnownType(WellKnownType.__Canon));
-
  default:
  throw new NotImplementedException();
  }

src/coreclr/src/tools/Common/JitInterface/CorInfoTypes.cs

@@ -492,8 +492,6 @@ public enum CorInfoClassId
  CLASSID_STRING,
  CLASSID_ARGUMENT_HANDLE,
  CLASSID_RUNTIME_TYPE,
- CLASSID_ENUM,
- CLASSID___CANON,
  }
  public enum CorInfoInline
  {

src/coreclr/src/tools/Common/TypeSystem/Common/TypeDesc.cs

@@ -120,8 +120,6 @@ internal void SetWellKnownType(WellKnownType wellKnownType)
  flags = TypeFlags.ValueType;
  break;
 
- // Should WellKnownType.__Canon be handled here?
-
  default:
  throw new ArgumentException();
  }

src/coreclr/src/tools/Common/TypeSystem/Common/WellKnownType.cs

@@ -48,6 +48,5 @@ public enum WellKnownType
 
  TypedReference,
  ByReferenceOfT,
- __Canon,
  }
 }

src/coreclr/src/vm/jitinterface.cpp

@@ -4310,12 +4310,6 @@ CORINFO_CLASS_HANDLE CEEInfo::getBuiltinClass(CorInfoClassId classId)
  case CLASSID_RUNTIME_TYPE:
  result = CORINFO_CLASS_HANDLE(g_pRuntimeTypeClass);
  break;
- case CLASSID_ENUM:
- result = CORINFO_CLASS_HANDLE(g_pEnumClass);
- break;
- case CLASSID___CANON:
- result = CORINFO_CLASS_HANDLE(g_pCanonMethodTableClass);
- break;
  default:
  _ASSERTE(!"NYI: unknown classId");
  break;