Skip to content
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.Reflection.Metadata;
using System.Reflection.Metadata.Ecma335;
Expand Down Expand Up @@ -27,6 +28,8 @@ enum JniParamKind
/// </summary>
static class JniSignatureHelper
{
static readonly SearchValues<char> JavaSourceNameSeparators = SearchValues.Create ("/$");

/// <summary>
/// Parses the parameter types from a JNI method signature like "(Landroid/os/Bundle;)V".
/// </summary>
Expand Down Expand Up @@ -234,7 +237,11 @@ internal static void ValidateJniName (string jniName)
/// </summary>
internal static string JniNameToJavaName (string jniName)
{
return jniName.Replace ('/', '.').Replace ('$', '.');
if (jniName.AsSpan ().IndexOfAny (JavaSourceNameSeparators) < 0) {
return jniName;
}
return string.Create (jniName.Length, jniName, static (destination, name) =>
name.AsSpan ().ReplaceAny (destination, JavaSourceNameSeparators, '.'));
}

/// <summary>
Expand All @@ -259,7 +266,8 @@ internal static string JniNameToJavaBinaryName (string jniName)
if (lastSlash < 0) {
return null;
}
return jniName.Substring (0, lastSlash).Replace ('/', '.');
return string.Create (lastSlash, jniName, static (destination, name) =>
name.AsSpan (0, destination.Length).Replace (destination, '/', '.'));
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
Expand All @@ -16,23 +17,31 @@ static class MetadataHelper
/// </summary>
public static Guid DeterministicMvid (string moduleName, ReadOnlySpan<byte> contentBytes = default)
{
using var sha = SHA256.Create ();
byte [] nameBytes = Encoding.UTF8.GetBytes (moduleName);
byte [] input = new byte [nameBytes.Length + contentBytes.Length];
nameBytes.CopyTo (input, 0);
contentBytes.CopyTo (input.AsSpan (nameBytes.Length));
byte [] hash = sha.ComputeHash (input);
byte [] guidBytes = new byte [16];
Array.Copy (hash, guidBytes, 16);
return new Guid (guidBytes);
const int stackallocThresholdBytes = 256;
int nameByteCount = Encoding.UTF8.GetByteCount (moduleName);
int byteCount = checked (nameByteCount + contentBytes.Length);
byte []? rented = null;
Span<byte> input = byteCount <= stackallocThresholdBytes
? stackalloc byte [stackallocThresholdBytes]
: (rented = ArrayPool<byte>.Shared.Rent (byteCount));
Comment thread
simonrozsival marked this conversation as resolved.
Resolved
try {
Encoding.UTF8.GetBytes (moduleName.AsSpan (), input [..nameByteCount]);
contentBytes.CopyTo (input [nameByteCount..]);
Span<byte> hash = stackalloc byte [SHA256.HashSizeInBytes];
SHA256.HashData (input [..byteCount], hash);
return new Guid (hash [..16]);
} finally {
if (rented is not null) {
ArrayPool<byte>.Shared.Return (rented);
}
}
}

/// <summary>
/// Computes a content fingerprint for the given <see cref="TypeMapAssemblyData"/>.
/// </summary>
public static byte [] ComputeContentFingerprint (TypeMapAssemblyData data)
{
using var sha = SHA256.Create ();
using var stream = new MemoryStream ();
using var writer = new BinaryWriter (stream, Encoding.UTF8);
foreach (var entry in data.Entries) {
Expand Down Expand Up @@ -66,7 +75,7 @@ public static byte [] ComputeContentFingerprint (TypeMapAssemblyData data)
writer.Write (assoc.AliasProxyTypeReference);
}
writer.Flush ();
return sha.ComputeHash (stream.GetBuffer (), 0, checked ((int) stream.Length));
return SHA256.HashData (stream.GetBuffer ().AsSpan (0, checked ((int) stream.Length)));
}

/// <summary>
Expand All @@ -76,7 +85,6 @@ public static byte [] ComputeContentFingerprint (TypeMapAssemblyData data)
/// </summary>
public static byte [] ComputeIncrementalFingerprint (TypeMapAssemblyData data, Version systemRuntimeVersion, bool useSharedTypemapUniverse)
{
using var sha = SHA256.Create ();
using var stream = new MemoryStream ();
using var writer = new BinaryWriter (stream, Encoding.UTF8);
writer.Write (GeneratorModuleVersionId.ToByteArray ());
Expand Down Expand Up @@ -137,7 +145,7 @@ public static byte [] ComputeIncrementalFingerprint (TypeMapAssemblyData data, V
writer.Write (assemblyName);
}
writer.Flush ();
return sha.ComputeHash (stream.GetBuffer (), 0, checked ((int) stream.Length));
return SHA256.HashData (stream.GetBuffer ().AsSpan (0, checked ((int) stream.Length)));
}

/// <summary>
Expand All @@ -148,7 +156,6 @@ public static byte [] ComputeRootIncrementalFingerprint (
Version systemRuntimeVersion,
bool useSharedTypemapUniverse)
{
using var sha = SHA256.Create ();
using var stream = new MemoryStream ();
using var writer = new BinaryWriter (stream, Encoding.UTF8);
writer.Write (GeneratorModuleVersionId.ToByteArray ());
Expand All @@ -159,7 +166,7 @@ public static byte [] ComputeRootIncrementalFingerprint (
writer.Write (assemblyName);
}
writer.Flush ();
return sha.ComputeHash (stream.GetBuffer (), 0, checked ((int) stream.Length));
return SHA256.HashData (stream.GetBuffer ().AsSpan (0, checked ((int) stream.Length)));
}

static void WriteTypeRef (this BinaryWriter writer, TypeRefData type)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;

namespace Microsoft.Android.Sdk.TrimmableTypeMap;

Expand All @@ -15,6 +15,10 @@ namespace Microsoft.Android.Sdk.TrimmableTypeMap;
static class ModelBuilder
{
const string ProxyTypeSuffix = "_Proxy";
const string AliasHolderTypeSuffix = "_Aliases";

static readonly SearchValues<char> ManagedTypeNameSeparators = SearchValues.Create (".+`");
static readonly SearchValues<char> JniNameSeparators = SearchValues.Create ("/$");

static readonly HashSet<string> EssentialRuntimeTypes = new (StringComparer.Ordinal) {
"java/lang/Object",
Expand Down Expand Up @@ -162,7 +166,7 @@ static void EmitPeers (TypeMapAssemblyData model, string jniName,
// Alias group: generate an alias holder and indexed entries for each peer.
// The base JNI name maps to the alias holder; each peer gets "[0]", "[1]", etc.
var aliasKeys = new List<string> ();
string holderTypeName = jniName.Replace ('/', '_').Replace ('$', '_') + "_Aliases";
string holderTypeName = JniNameToAliasHolderTypeName (jniName);
var holderNamespace = "_TypeMap.Aliases";
string holderRef = AssemblyQualify ($"{holderNamespace}.{holderTypeName}", assemblyName);

Expand Down Expand Up @@ -252,18 +256,18 @@ static void AddIfCrossAssembly (SortedSet<string> set, string? asmName, string o

static string ManagedTypeNameToProxyTypeName (string managedTypeName)
{
var builder = new StringBuilder (managedTypeName.Length + ProxyTypeSuffix.Length);
AppendSafeManagedTypeName (builder, managedTypeName);
builder.Append (ProxyTypeSuffix);
return builder.ToString ();
return string.Create (managedTypeName.Length + ProxyTypeSuffix.Length, managedTypeName, static (destination, name) => {
name.AsSpan ().ReplaceAny (destination, ManagedTypeNameSeparators, '_');
ProxyTypeSuffix.AsSpan ().CopyTo (destination [name.Length..]);
});
}

static void AppendSafeManagedTypeName (StringBuilder builder, string managedTypeName)
static string JniNameToAliasHolderTypeName (string jniName)
{
for (int i = 0; i < managedTypeName.Length; i++) {
char c = managedTypeName [i];
builder.Append (c == '.' || c == '+' || c == '`' ? '_' : c);
}
return string.Create (jniName.Length + AliasHolderTypeSuffix.Length, jniName, static (destination, name) => {
name.AsSpan ().ReplaceAny (destination, JniNameSeparators, '_');
AliasHolderTypeSuffix.AsSpan ().CopyTo (destination [name.Length..]);
});
}

static JavaPeerProxyData BuildProxyType (JavaPeerInfo peer, string jniName, HashSet<string> usedProxyNames, bool isAcw)
Expand Down
95 changes: 47 additions & 48 deletions src/Microsoft.Android.Sdk.TrimmableTypeMap/JavaNameValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ internal static class JavaNameValidator
"permits", "record", "sealed", "var", "yield",
};

internal static bool IsInvalidIdentifier (string identifier, bool isTypeName) =>
internal static bool IsInvalidIdentifier (ReadOnlySpan<char> identifier, bool isTypeName) =>
!IsSupportedIdentifier (identifier, isPackageSegment: false) ||
JavaKeywords.Contains (identifier) ||
isTypeName && RestrictedTypeIdentifiers.Contains (identifier);
JavaKeywords.GetAlternateLookup<ReadOnlySpan<char>> ().Contains (identifier) ||
isTypeName && RestrictedTypeIdentifiers.GetAlternateLookup<ReadOnlySpan<char>> ().Contains (identifier);

static bool IsInvalidPackageIdentifier (string identifier) =>
static bool IsInvalidPackageIdentifier (ReadOnlySpan<char> identifier) =>
!IsSupportedIdentifier (identifier, isPackageSegment: true) ||
JavaKeywords.Contains (identifier);
JavaKeywords.GetAlternateLookup<ReadOnlySpan<char>> ().Contains (identifier);

// JLS 3.8 permits combining, format, and supplementary characters, but generated JCWs also need
// stable source paths and class names throughout javac, AAPT, DEX, and the Android runtime.
static bool IsSupportedIdentifier (string identifier, bool isPackageSegment)
static bool IsSupportedIdentifier (ReadOnlySpan<char> identifier, bool isPackageSegment)
{
if (identifier.Length == 0) {
return false;
Expand Down Expand Up @@ -88,11 +88,12 @@ static bool IsIdentifierPart (int value, bool isPackageSegment) =>
? value <= char.MaxValue && JavaIdentifierData.IsPackageIdentifierPart ((char) value)
: JavaIdentifierData.IsSupportedIdentifierPart (value);

internal static bool TryGetInvalidPackageSegment (string packageName, char separator, out string invalidSegment)
internal static bool TryGetInvalidPackageSegment (ReadOnlySpan<char> packageName, char separator, out string invalidSegment)
{
foreach (var segment in packageName.Split (separator)) {
foreach (var range in packageName.Split (separator)) {
var segment = packageName [range];
if (IsInvalidPackageIdentifier (segment)) {
invalidSegment = segment;
invalidSegment = segment.ToString ();
return true;
}
}
Expand All @@ -101,34 +102,31 @@ internal static bool TryGetInvalidPackageSegment (string packageName, char separ
return false;
}

internal static bool TryGetInvalidJniNameSegment (string jniName, out string invalidSegment)
internal static bool TryGetInvalidJniNameSegment (ReadOnlySpan<char> jniName, out string invalidSegment)
{
var segments = jniName.Split ('/');
for (int i = 0; i < segments.Length - 1; i++) {
if (IsInvalidPackageIdentifier (segments [i])) {
invalidSegment = segments [i];
return true;
}
int lastSlash = jniName.LastIndexOf ('/');
if (lastSlash >= 0 && TryGetInvalidPackageSegment (jniName [..lastSlash], '/', out invalidSegment)) {
return true;
}

string typeName = segments [segments.Length - 1];
var typeName = jniName [(lastSlash + 1)..];
if (IsInvalidIdentifier (typeName, isTypeName: true)) {
invalidSegment = typeName;
invalidSegment = typeName.ToString ();
return true;
}

invalidSegment = "";
return false;
}

internal static bool TryGetInvalidJniManifestNameSegment (string jniName, out string invalidSegment)
internal static bool TryGetInvalidJniManifestNameSegment (ReadOnlySpan<char> jniName, out string invalidSegment)
{
var segments = jniName.Split ('/');
for (int i = 0; i < segments.Length; i++) {
bool isTypeName = i == segments.Length - 1;
if (IsInvalidPackageIdentifier (segments [i]) ||
isTypeName && RestrictedTypeIdentifiers.Contains (segments [i])) {
invalidSegment = segments [i];
foreach (var range in jniName.Split ('/')) {
var segment = jniName [range];
bool isTypeName = range.End.Value == jniName.Length;
if (IsInvalidPackageIdentifier (segment) ||
isTypeName && RestrictedTypeIdentifiers.GetAlternateLookup<ReadOnlySpan<char>> ().Contains (segment)) {
invalidSegment = segment.ToString ();
return true;
}
}
Expand All @@ -137,33 +135,34 @@ internal static bool TryGetInvalidJniManifestNameSegment (string jniName, out st
return false;
}

internal static bool TryGetInvalidJniSourceTypeSegment (string jniName, out string invalidSegment)
internal static bool TryGetInvalidJniSourceTypeSegment (ReadOnlySpan<char> jniName, out string invalidSegment)
{
if (TryGetInvalidJniNameSegment (jniName, out invalidSegment)) {
return true;
}

// '$' becomes '.' when a JNI binary name is emitted as a Java source type reference.
string typeName = jniName.Substring (jniName.LastIndexOf ('/') + 1);
foreach (var segment in typeName.Split ('$')) {
var typeName = jniName [(jniName.LastIndexOf ('/') + 1)..];
foreach (var range in typeName.Split ('$')) {
var segment = typeName [range];
if (IsInvalidIdentifier (segment, isTypeName: true)) {
invalidSegment = segment;
invalidSegment = segment.ToString ();
return true;
}
}

return false;
}

internal static bool TryGetInvalidJniTypeSegment (string jniType, out string typeName, out string invalidSegment)
internal static bool TryGetInvalidJniTypeSegment (ReadOnlySpan<char> jniType, out string typeName, out string invalidSegment)
{
int typeStart = 0;
while (typeStart < jniType.Length && jniType [typeStart] == '[') {
typeStart++;
}

if (typeStart < jniType.Length - 1 && jniType [typeStart] == 'L' && jniType [jniType.Length - 1] == ';') {
typeName = jniType.Substring (typeStart + 1, jniType.Length - typeStart - 2);
typeName = jniType [(typeStart + 1)..^1].ToString ();
return TryGetInvalidJniSourceTypeSegment (typeName, out invalidSegment);
}

Expand All @@ -172,24 +171,24 @@ internal static bool TryGetInvalidJniTypeSegment (string jniType, out string typ
return false;
}

internal static bool TryGetInvalidJavaSourceTypeSegment (string javaType, out string invalidSegment)
internal static bool TryGetInvalidJavaSourceTypeSegment (ReadOnlySpan<char> javaType, out string invalidSegment)
{
string typeName = javaType;
var typeName = javaType;
while (typeName.EndsWith ("[]", StringComparison.Ordinal)) {
typeName = typeName.Substring (0, typeName.Length - 2);
typeName = typeName [..^2];
}
if (typeName is "boolean" or "byte" or "char" or "short" or "int" or "long" or "float" or "double" or "void") {
invalidSegment = "";
return false;
}

var segments = typeName.Split ('.');
for (int i = 0; i < segments.Length; i++) {
var nestedSegments = segments [i].Split ('$');
for (int nestedIndex = 0; nestedIndex < nestedSegments.Length; nestedIndex++) {
bool isTypeName = i == segments.Length - 1 || nestedIndex > 0;
if (IsInvalidIdentifier (nestedSegments [nestedIndex], isTypeName)) {
invalidSegment = nestedSegments [nestedIndex];
foreach (var range in typeName.Split ('.')) {
var segment = typeName [range];
foreach (var nestedRange in segment.Split ('$')) {
var nestedSegment = segment [nestedRange];
bool isTypeName = range.End.Value == typeName.Length || nestedRange.Start.Value > 0;
if (IsInvalidIdentifier (nestedSegment, isTypeName)) {
invalidSegment = nestedSegment.ToString ();
return true;
}
}
Expand All @@ -199,14 +198,14 @@ internal static bool TryGetInvalidJavaSourceTypeSegment (string javaType, out st
return false;
}

internal static bool TryGetInvalidJavaManifestTypeSegment (string javaType, out string invalidSegment)
internal static bool TryGetInvalidJavaManifestTypeSegment (ReadOnlySpan<char> javaType, out string invalidSegment)
{
var segments = javaType.Split ('.');
for (int i = 0; i < segments.Length; i++) {
bool isTypeName = i == segments.Length - 1;
if (IsInvalidPackageIdentifier (segments [i]) ||
isTypeName && RestrictedTypeIdentifiers.Contains (segments [i])) {
invalidSegment = segments [i];
foreach (var range in javaType.Split ('.')) {
var segment = javaType [range];
bool isTypeName = range.End.Value == javaType.Length;
if (IsInvalidPackageIdentifier (segment) ||
isTypeName && RestrictedTypeIdentifiers.GetAlternateLookup<ReadOnlySpan<char>> ().Contains (segment)) {
invalidSegment = segment.ToString ();
return true;
}
}
Expand Down
Loading
Loading