Skip to content

[NativeAOT] Improve managed type map #9909

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

Closed
wants to merge 4 commits into from
Closed

[NativeAOT] Improve managed type map #9909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bdb184
Include assembly name in hash
simonrozsival Mar 11, 2025
ebe1f34
Use assembly qualified name
simonrozsival Mar 11, 2025
239d8ca
Account for generic types
simonrozsival Mar 12, 2025
4636656
Use more explicit naming
simonrozsival Mar 12, 2025
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
26 changes: 5 additions & 21 deletions src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/TypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,18 @@ internal static bool TryGetType (string javaClassName, [NotNullWhen (true)] out
throw new InvalidOperationException ($"Type with hash {hash} not found.");
}

// ensure this is not a hash collision
var resolvedJavaClassName = GetJavaClassNameByIndex (TypeIndexToJavaClassNameIndex [typeIndex]);
if (resolvedJavaClassName != javaClassName) {
type = null;
return false;
}

return true;
}

internal static bool TryGetJavaClassName (Type type, [NotNullWhen (true)] out string? className)
{
string? fullName = type.FullName;
if (fullName is null) {
string? name = type.AssemblyQualifiedName;
if (name is null) {
className = null;
return false;
}

ulong hash = Hash (fullName);
ulong hash = Hash (name);

// the hashes array is sorted and all the hashes are unique
int javaClassNameIndex = MemoryExtensions.BinarySearch (TypeNameHashes, hash);
Expand All @@ -58,19 +51,12 @@ internal static bool TryGetJavaClassName (Type type, [NotNullWhen (true)] out st
throw new InvalidOperationException ($"Java class name with hash {hash} not found.");
}

// ensure this is not a hash collision
var resolvedType = GetTypeByIndex (JavaClassNameIndexToTypeIndex [javaClassNameIndex]);
if (resolvedType?.FullName != type.FullName) {
className = null;
return false;
}

return true;
}

private static ulong Hash (string javaClassName)
private static ulong Hash (string value)
{
ReadOnlySpan<byte> bytes = MemoryMarshal.AsBytes (javaClassName.AsSpan ());
ReadOnlySpan<byte> bytes = MemoryMarshal.AsBytes (value.AsSpan ());
ulong hash = XxHash3.HashToUInt64 (bytes);

// The bytes in the hashes array are stored as little endian. If the target platform is big endian,
Expand All @@ -85,8 +71,6 @@ private static ulong Hash (string javaClassName)
// Replaced by src/Microsoft.Android.Sdk.ILLink/TypeMappingStep.cs
private static ReadOnlySpan<ulong> JavaClassNameHashes => throw new NotImplementedException ();
private static ReadOnlySpan<ulong> TypeNameHashes => throw new NotImplementedException ();
private static ReadOnlySpan<int> JavaClassNameIndexToTypeIndex => throw new NotImplementedException ();
private static ReadOnlySpan<int> TypeIndexToJavaClassNameIndex => throw new NotImplementedException ();
private static Type? GetTypeByIndex (int index) => throw new NotImplementedException ();
private static string? GetJavaClassNameByIndex (int index) => throw new NotImplementedException ();
}
48 changes: 18 additions & 30 deletions src/Microsoft.Android.Sdk.ILLink/TypeMappingStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,14 @@ protected override void EndProcess ()
GenerateGetTypeByIndex (types);

// .NET -> Java mapping
KeyValuePair<string, List<TypeDefinition>>[] orderedManagedToJavaMapping = TypeMappings.OrderBy (kvp => Hash (SelectTypeDefinition(kvp.Key, kvp.Value).FullName)).ToArray ();
var orderedManagedToJavaMapping = TypeMappings.SelectMany(kvp => kvp.Value.Select (type => new KeyValuePair<string, TypeDefinition>(kvp.Key, type))).OrderBy (kvp => Hash (GetAssemblyQualifiedTypeName (kvp.Value))).ToArray ();

var dotnetTypeNameHashes = orderedManagedToJavaMapping.Select (kvp => Hash (SelectTypeDefinition(kvp.Key, kvp.Value).FullName)).ToArray ();
var dotnetTypeNameHashes = orderedManagedToJavaMapping.Select (kvp => Hash (GetAssemblyQualifiedTypeName (kvp.Value))).ToArray ();
GenerateHashes (dotnetTypeNameHashes, methodName: "get_TypeNameHashes");

string[] javaClassNames = orderedManagedToJavaMapping.Select (kvp => kvp.Key).ToArray ();
var javaClassNames = orderedManagedToJavaMapping.Select (kvp => kvp.Key).ToArray ();
GenerateGetJavaClassNameByIndex (javaClassNames);

// Generate remap arrays
var typeIndexKeys = orderedJavaToDotnetMapping.Select (kvp => kvp.Key).ToArray ();
var javaClassNameIndexKeys = orderedManagedToJavaMapping.Select (kvp => kvp.Key).ToArray ();
GenerateIndexRemapping (typeIndexKeys, javaClassNameIndexKeys);

void GenerateGetTypeByIndex (IEnumerable<TypeDefinition> types)
{
var method = type.Methods.FirstOrDefault (m => m.Name == "GetTypeByIndex");
Expand Down Expand Up @@ -173,28 +168,6 @@ void GenerateHashes (ulong[] hashes, string methodName)
GenerateReadOnlySpanGetter<ulong> (type, methodName, hashes, sizeof (ulong), BitConverter.GetBytes);
}

void GenerateIndexRemapping (string[] typeIndexKeys, string[] javaClassNameIndexKeys)
{
System.Diagnostics.Debug.Assert(typeIndexKeys.Length == javaClassNameIndexKeys.Length);
int length = typeIndexKeys.Length;

var javaClassNameIndexToTypeIndex = new int[length];
var typeIndexToJavaClassNameIndex = new int[length];

for (int i = 0; i < length; i++) {
for (int j = 0; j < length; j++) {
if (typeIndexKeys[i] == javaClassNameIndexKeys[j]) {
typeIndexToJavaClassNameIndex[i] = j;
javaClassNameIndexToTypeIndex[j] = i;
break;
}
}
}

GenerateReadOnlySpanGetter (type, "get_JavaClassNameIndexToTypeIndex", javaClassNameIndexToTypeIndex, sizeof (int), BitConverter.GetBytes);
GenerateReadOnlySpanGetter (type, "get_TypeIndexToJavaClassNameIndex", typeIndexToJavaClassNameIndex, sizeof (int), BitConverter.GetBytes);
}

void GenerateReadOnlySpanGetter<T> (TypeDefinition type, string name, T[] data, int sizeOfT, Func<T, byte[]> getBytes)
where T : struct
{
Expand Down Expand Up @@ -243,6 +216,13 @@ TypeDefinition GetArrayType (TypeDefinition type, int size)

return arrayType;
}

string GetAssemblyQualifiedTypeName (TypeDefinition type)
{
var fullName = type.FullName.Replace ('/', '.').Replace ('+', '.');
var assemblyName = type.Module.Assembly.FullName;
return $"{fullName}, {assemblyName}";
}
}

TypeDefinition SelectTypeDefinition (string javaName, List<TypeDefinition> list)
Expand All @@ -269,6 +249,14 @@ TypeDefinition SelectTypeDefinition (string javaName, List<TypeDefinition> list)
best = type;
continue;
}

// we found a generic subclass of a non-generic type
if (type.IsGenericInstance &&
!best.IsGenericInstance &&
type.IsAssignableFrom (best, Context)) {
best = type;
continue;
}
}
foreach (var type in list) {
if (type == best)
Expand Down
Loading