Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Import isinst/castclass Nullable as underlying type #87241

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
merged 13 commits into from
Jun 21, 2023
Merged

Import isinst/castclass Nullable as underlying type #87241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
168f833
Import isinst Nullable as underlying type
huoyaoyuan Jun 8, 2023
e0cd0e2
Update JIT interface for getCastingHelper
huoyaoyuan Jun 8, 2023
8522424
Revert
huoyaoyuan Jun 9, 2023
c722484
Resolve nullable as underlying type when CORINFO_TOKENKIND_Casting
huoyaoyuan Jun 9, 2023
8e5392a
Simplify token validation
huoyaoyuan Jun 9, 2023
3ddd0ea
Switch exhaustiveness
huoyaoyuan Jun 9, 2023
3e58229
IL test coverage for castclass
huoyaoyuan Jun 9, 2023
ab9520f
Remove unused comment
huoyaoyuan Jun 10, 2023
1ab940b
Fix il
huoyaoyuan Jun 12, 2023
85ba6f2
Revert implementation
huoyaoyuan Jun 16, 2023
2b10425
Implement at JIT side
huoyaoyuan Jun 16, 2023
3855226
Fix IL test
huoyaoyuan Jun 17, 2023
e71042b
Avoid unnecessary JIT to EE call
huoyaoyuan Jun 18, 2023
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
Prev Previous commit
Next Next commit
Revert implementation
  • Loading branch information
@huoyaoyuan
huoyaoyuan committed Jun 16, 2023
commit 85ba6f203aa01beedc3a61f8f3b85b4231042dd7
8 changes: 0 additions & 8 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,14 +1789,6 @@ private void resolveToken(ref CORINFO_RESOLVED_TOKEN pResolvedToken)

type = type.MakeArrayType();
}
else if (pResolvedToken.tokenType == CorInfoTokenKind.CORINFO_TOKENKIND_Casting)
{
if (type.IsVoid)
ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramSpecific, methodIL.OwningMethod);

if (type.IsNullable)
type = type.Instantiation[0];
}
pResolvedToken.hClass = ObjectToHandle(type);

#if !SUPPORT_JIT
Expand Down
33 changes: 15 additions & 18 deletions src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,28 +1156,25 @@ void CEEInfo::resolveToken(/* IN, OUT */ CORINFO_RESOLVED_TOKEN * pResolvedToken
// tokenType specific verification and transformations
//
CorElementType et = th.GetInternalCorElementType();

if (tokenType != CORINFO_TOKENKIND_Ldtoken)
switch (tokenType)
{
// Disallow ELEMENT_TYPE_BYREF and ELEMENT_TYPE_VOID
if (et == ELEMENT_TYPE_BYREF || et == ELEMENT_TYPE_VOID)
COMPlusThrow(kInvalidProgramException);
case CORINFO_TOKENKIND_Ldtoken:
// Allow everything.
break;

switch (tokenType)
{
case CORINFO_TOKENKIND_Newarr:
th = ClassLoader::LoadArrayTypeThrowing(th);
break;
case CORINFO_TOKENKIND_Newarr:
// Disallow ELEMENT_TYPE_BYREF and ELEMENT_TYPE_VOID
if (et == ELEMENT_TYPE_BYREF || et == ELEMENT_TYPE_VOID)
COMPlusThrow(kInvalidProgramException);

case CORINFO_TOKENKIND_Casting:
// isinst and castclass to Nullable<T> is same as underlying type
if (Nullable::IsNullableType(th))
th = th.AsMethodTable()->GetInstantiation()[0];
break;
th = ClassLoader::LoadArrayTypeThrowing(th);
break;

default:
break;
}
default:
// Disallow ELEMENT_TYPE_BYREF and ELEMENT_TYPE_VOID
if (et == ELEMENT_TYPE_BYREF || et == ELEMENT_TYPE_VOID)
COMPlusThrow(kInvalidProgramException);
break;
}

// The JIT interface should always return fully loaded types
Expand Down