Skip to content

[Xamarin.Android.Tools.Bytecode] Allow null enclosing method #479

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
Aug 18, 2019
Merged

[Xamarin.Android.Tools.Bytecode] Allow null enclosing method #479

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/Xamarin.Android.Tools.Bytecode/ClassFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public bool TryGetEnclosingMethodInfo (out string declaringClass, out string dec
}

declaringClass = enclosingMethod.Class.Name.Value;
declaringMethod = enclosingMethod.Method.Name.Value;
declaringDescriptor = enclosingMethod.Method.Descriptor.Value;
declaringMethod = enclosingMethod.Method?.Name.Value;
declaringDescriptor = enclosingMethod.Method?.Descriptor.Value;
return true;
}

Expand Down
15 changes: 8 additions & 7 deletions src/Xamarin.Android.Tools.Bytecode/XmlClassDeclarationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,18 @@ static string GetDeprecatedValue (AttributeCollection attributes)
return "deprecated";
}

XAttribute[] GetEnclosingMethod ()
IEnumerable<XAttribute> GetEnclosingMethod ()
{
string declaringClass, declaringMethod, declaringDescriptor;
if (!classFile.TryGetEnclosingMethodInfo (out declaringClass, out declaringMethod, out declaringDescriptor)) {
return null;
yield break;
}
return new []{
new XAttribute ("enclosing-method-jni-type", "L" + declaringClass + ";"),
new XAttribute ("enclosing-method-name", declaringMethod),
new XAttribute ("enclosing-method-signature", declaringDescriptor),
};
if (declaringClass != null)
yield return new XAttribute ("enclosing-method-jni-type", "L" + declaringClass + ";");
if (declaringMethod != null)
yield return new XAttribute ("enclosing-method-name", declaringMethod);
if (declaringDescriptor != null)
yield return new XAttribute ("enclosing-method-signature", declaringDescriptor);
}

XAttribute[] GetExtends ()
Expand Down