Skip to content

Small cleanup in the cctor interpreter #97141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 1 commit into from
Jan 18, 2024
Merged

Small cleanup in the cctor interpreter #97141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/TypePreinit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,9 +1860,7 @@ private bool TryHandleIntrinsicCall(MethodDesc method, Value[] parameters, out V
return spanRef.TryAccessElement(spanIndex.AsInt32(), out retVal);
}
return false;
case "GetTypeFromHandle" when method.OwningType is MetadataType typeType
&& typeType.Name == "Type" && typeType.Namespace == "System"
&& typeType.Module == typeType.Context.SystemModule
case "GetTypeFromHandle" when IsSystemType(method.OwningType)
&& parameters[0] is RuntimeTypeHandleValue typeHandle:
{
if (!_internedTypes.TryGetValue(typeHandle.Type, out RuntimeTypeValue runtimeType))
Expand All @@ -1872,24 +1870,25 @@ private bool TryHandleIntrinsicCall(MethodDesc method, Value[] parameters, out V
retVal = runtimeType;
return true;
}
case "get_IsValueType" when method.OwningType is MetadataType typeType
&& typeType.Name == "Type" && typeType.Namespace == "System"
&& typeType.Module == typeType.Context.SystemModule
case "get_IsValueType" when IsSystemType(method.OwningType)
&& parameters[0] is RuntimeTypeValue typeToCheckForValueType:
{
retVal = ValueTypeValue.FromSByte(typeToCheckForValueType.TypeRepresented.IsValueType ? (sbyte)1 : (sbyte)0);
return true;
}
case "op_Equality" when method.OwningType is MetadataType typeType
&& typeType.Name == "Type" && typeType.Namespace == "System"
&& typeType.Module == typeType.Context.SystemModule
case "op_Equality" when IsSystemType(method.OwningType)
&& (parameters[0] is RuntimeTypeValue || parameters[1] is RuntimeTypeValue):
{
retVal = ValueTypeValue.FromSByte(parameters[0] == parameters[1] ? (sbyte)1 : (sbyte)0);
return true;
}
}

static bool IsSystemType(TypeDesc type)
=> type is MetadataType typeType
&& typeType.Name == "Type" && typeType.Namespace == "System"
&& typeType.Module == typeType.Context.SystemModule;

return false;
}

Expand Down