Skip to content

[release/10.0] Do not store result of cast in IDynIntfCastable scenarios #125637

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

Open
github-actions wants to merge 2 commits into
base: release/10.0
Choose a base branch
from
+34 −5
Open

[release/10.0] Do not store result of cast in IDynIntfCastable scenarios #125637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b1628e
Improve type cast cache update conditions
MichalStrehovsky Mar 16, 2026
30f09b1
Add TestRuntime125577Regression test case
MichalStrehovsky Mar 16, 2026
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
12 changes: 7 additions & 5 deletions src/coreclr/nativeaot/Runtime.Base/src/System/Runtime/TypeCast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,10 +1228,9 @@ internal static unsafe bool AreTypesAssignableInternalUncached(MethodTable* pSou
}

//
// Update the cache. We only consider type-based conversion rules here.
// Therefore a negative result cannot rule out convertibility for IDynamicInterfaceCastable.
// Update the cache
//
if (retObj != null || !(pTargetType->IsInterface && pSourceType->IsIDynamicInterfaceCastable))
if (!pSourceType->IsIDynamicInterfaceCastable || !pTargetType->IsInterface)
{
nuint sourceAndVariation = (nuint)pSourceType + (uint)AssignmentVariation.BoxedSource;
s_castCache.TrySet(sourceAndVariation, (nuint)pTargetType, retObj != null);
Expand Down Expand Up @@ -1270,8 +1269,11 @@ private static unsafe object CheckCastAny_NoCacheLookup(MethodTable* pTargetType
//
// Update the cache
//
nuint sourceAndVariation = (nuint)pSourceType + (uint)AssignmentVariation.BoxedSource;
s_castCache.TrySet(sourceAndVariation, (nuint)pTargetType, true);
if (!pSourceType->IsIDynamicInterfaceCastable || !pTargetType->IsInterface)
{
nuint sourceAndVariation = (nuint)pSourceType + (uint)AssignmentVariation.BoxedSource;
s_castCache.TrySet(sourceAndVariation, (nuint)pTargetType, true);
}

return obj;
}
Expand Down
27 changes: 27 additions & 0 deletions src/tests/nativeaot/SmokeTests/UnitTests/Interfaces.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public static int Run()
TestDynamicStaticGenericVirtualMethods.Run();
TestRuntime109496Regression.Run();
TestRuntime113664Regression.Run();
TestRuntime125577Regression.Run();

return Pass;
}
Expand Down Expand Up @@ -2046,4 +2047,30 @@ static string Frob<T, U, V>() where T : class, IFoo<U> where U : class where V :
return T.Frob<V>();
}
}

class TestRuntime125577Regression
{
class Shapeshifter : IDynamicInterfaceCastable
{
bool _result;
public Shapeshifter(bool result) => _result = result;

public RuntimeTypeHandle GetInterfaceImplementation(RuntimeTypeHandle interfaceType) => throw new NotImplementedException();
public bool IsInterfaceImplemented(RuntimeTypeHandle interfaceType, bool throwIfNotImplemented) => _result;
}

[MethodImpl(MethodImplOptions.NoInlining)]
static bool Is(object o, bool expected) => o is IEnumerable<object> == expected;

public static void Run()
{
// Call multiple times in case we just flushed the cast cache (when we flush we don't store).
if (!Is(new Shapeshifter(true), true)
|| !Is(new Shapeshifter(false), false)
|| !Is(new Shapeshifter(true), true)
|| !Is(new Shapeshifter(false), false))
throw new Exception();
}
}

}
Loading