Optimize typeof(T).IsValueType

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

@@ -47,6 +47,7 @@ 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);
 
 #ifdef fatMC
  // to build up a fat mc

src/coreclr/src/inc/corinfo.h

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

src/coreclr/src/jit/importer.cpp

@@ -4015,6 +4015,75 @@ 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
+ //
+ // ldtoken [Type]
+ // call Type.GetTypeFromHandle (which is replaced with CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE)
+ // call Type.IsValueType (also IsClass and IsPrimitive)
+ //
+ // to `true` or `false`
+ // e.g. `typeof(int).IsValueType` => `true`
+ if (impStackTop().val->IsCall())
+ {
+ GenTreeCall* call = impStackTop().val->AsCall();
+ if (call->gtCallMethHnd == eeFindHelper(CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE))
+ {
+ GenTree* arg = call->Args().begin()->GetNode();
+ if (!arg->IsIntegralConst())
+ {
+ // e.g. GT_RUNTIMELOOKUP
+ break;
+ }
+ GenTreeIntCon* handle = arg->AsIntCon();
+ auto hClass = reinterpret_cast<CORINFO_CLASS_HANDLE>(handle->IconValue());
+ DWORD classAttr = info.compCompHnd->getClassAttribs(hClass);
+ if (classAttr & CORINFO_FLG_SHAREDINST)
+ {
+ // we have shared type instance
+ break;
+ }
+ BOOL isValueType = eeIsValueClass(hClass);
+ CorInfoType cit = info.compCompHnd->getTypeForPrimitiveValueClass(hClass);
+ if (ni == NI_System_Type_get_IsPrimitive)
+ {
+ if (isValueType)
+ {
+ bool isEnum = info.compCompHnd->getBuiltinClass(CLASSID_ENUM) ==
+ info.compCompHnd->getParentType(hClass);
+ retNode = gtNewIconNode(
+ (cit >= CORINFO_TYPE_BOOL) && (cit <= CORINFO_TYPE_DOUBLE) && !isEnum ? 1 : 0);
+ }
+ else
+ {
+ retNode = gtNewIconNode(0);
+ }
+ }
+ else if (ni == NI_System_Type_get_IsClass)
+ {
+ BOOL isInterface = info.compCompHnd->getClassAttribs(hClass) & CORINFO_FLG_INTERFACE;
+ retNode = // typeof(int*).IsClass has to be true (CORINFO_TYPE_PTR)
+ gtNewIconNode((cit == CORINFO_TYPE_PTR) || (!isValueType && !isInterface) ? 1 : 0);
+
+ }
+ 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;
+ }
+
 #ifdef FEATURE_HW_INTRINSICS
  case NI_System_Math_FusedMultiplyAdd:
  case NI_System_MathF_FusedMultiplyAdd:
@@ -4306,6 +4375,21 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
  result = NI_System_GC_KeepAlive;
  }
  }
+ else if (strcmp(className, "notType") == 0) // CI test
+ {
+ if (strcmp(methodName, "get_IsValueType") == 0)
+ {
+ 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
  else if (strcmp(namespaceName, "System.Buffers.Binary") == 0)

src/coreclr/src/jit/namedintrinsiclist.h

@@ -19,6 +19,9 @@ enum NamedIntrinsic : unsigned short
  NI_System_Collections_Generic_EqualityComparer_get_Default,
  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,6 +1689,9 @@ 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));
+
  default:
  throw new NotImplementedException();
  }

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

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

src/coreclr/src/vm/jitinterface.cpp

@@ -4310,6 +4310,9 @@ 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;
  default:
  _ASSERTE(!"NYI: unknown classId");
  break;