Skip to content

[Xamarin.Android.Build.Tasks] FixAbstractMethodsStep performance #8650

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
Feb 7, 2024
Merged

[Xamarin.Android.Build.Tasks] FixAbstractMethodsStep performance #8650

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
10 changes: 5 additions & 5 deletions src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/FixAbstractMethodsStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ bool MightNeedFix (TypeDefinition type)
return !type.IsAbstract && type.IsSubclassOf ("Java.Lang.Object", cache);
}

static bool CompareTypes (TypeReference iType, TypeReference tType)
bool CompareTypes (TypeReference iType, TypeReference tType)
{
if (iType.IsGenericParameter)
return true;
Expand All @@ -164,11 +164,11 @@ static bool CompareTypes (TypeReference iType, TypeReference tType)
if (iType.Namespace != tType.Namespace)
return false;

TypeDefinition iTypeDef = iType.Resolve ();
TypeDefinition iTypeDef = cache.Resolve (iType);
if (iTypeDef == null)
return false;

TypeDefinition tTypeDef = tType.Resolve ();
TypeDefinition tTypeDef = cache.Resolve (tType);
if (tTypeDef == null)
return false;

Expand Down Expand Up @@ -198,7 +198,7 @@ bool IsInOverrides (MethodDefinition iMethod, MethodDefinition tMethod)
return false;

foreach (var o in tMethod.Overrides)
if (o != null && iMethod == o.Resolve ())
if (o != null && iMethod.Name == o.Name && iMethod == cache.Resolve (o))
return true;

return false;
Expand Down Expand Up @@ -252,7 +252,7 @@ bool FixAbstractMethods (TypeDefinition type)

foreach (var ifaceInfo in type.Interfaces) {
var iface = ifaceInfo.InterfaceType;
var ifaceDef = iface.Resolve ();
var ifaceDef = cache.Resolve (iface);
if (ifaceDef == null) {
LogMessage ($"Unable to unresolve interface: {iface.FullName}");
continue;
Expand Down