Skip to content

[Mono.Android] Print type & member remapping info #7844

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 1 commit into from
Mar 2, 2023
Merged

[Mono.Android] Print type & member remapping info #7844

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
20 changes: 17 additions & 3 deletions src/Mono.Android/Android.Runtime/AndroidRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,16 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
var typeWithPrefix = desugarType.ToString ();
var typeWithSuffix = $"{jniSimpleReference}$-CC";

return new[]{
var replacements = new[]{
GetReplacementTypeCore (typeWithPrefix) ?? typeWithPrefix,
GetReplacementTypeCore (typeWithSuffix) ?? typeWithSuffix,
};

if (Logger.LogAssembly) {
var message = $"Remapping type `{jniSimpleReference}` to one one of {{ `{replacements[0]}`, `{replacements[1]}` }}";
Logger.Log (LogLevel.Debug, "monodroid-assembly", message);
}
return replacements;
}

protected override string? GetReplacementTypeCore (string jniSimpleReference)
Expand Down Expand Up @@ -350,11 +356,19 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)

var method = new JniRemappingReplacementMethod ();
method = Marshal.PtrToStructure<JniRemappingReplacementMethod>(retInfo);
var newSignature = jniMethodSignature;

int? paramCount = null;
if (method.is_static) {
paramCount = JniMemberSignature.GetParameterCountFromMethodSignature (jniMethodSignature) + 1;
jniMethodSignature = $"(L{jniSourceType};" + jniMethodSignature.Substring ("(".Length);
newSignature = $"(L{jniSourceType};" + jniMethodSignature.Substring ("(".Length);
}

if (Logger.LogAssembly) {
var message = $"Remapping method `{jniSourceType}.{jniMethodName}{jniMethodSignature}` to " +
$"`{method.target_type}.{method.target_name}{newSignature}`; " +
$"param-count: {paramCount}; instance-to-static? {method.is_static}";
Logger.Log (LogLevel.Debug, "monodroid-assembly", message);
}

return new JniRuntime.ReplacementMethodInfo {
Expand All @@ -363,7 +377,7 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
SourceJniMethodSignature = jniMethodSignature,
TargetJniType = method.target_type,
TargetJniMethodName = method.target_name,
TargetJniMethodSignature = jniMethodSignature,
TargetJniMethodSignature = newSignature,
TargetJniMethodParameterCount = paramCount,
TargetJniMethodInstanceToStatic = method.is_static,
};
Expand Down