Skip to content

[Xamarin.Android.Tools.Bytecode] Support @JvmOverloads #651

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
May 20, 2020
Merged

[Xamarin.Android.Tools.Bytecode] Support @JvmOverloads #651

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
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.Bytecode/AttributeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ public string Descriptor {

public override string ToString ()
{
return string.Format ("LocalVariableTableEntry(Name='{0}', Descriptor='{1}')", Name, Descriptor);
return $"LocalVariableTableEntry(Name='{Name}', Descriptor='{Descriptor}', StartPC={StartPC}, Index={Index})";
}
}

Expand Down
2 changes: 2 additions & 0 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 @@ -98,6 +98,8 @@ public string PackageName {
}
}

public string FullJniName => "L" + ThisClass.Name.Value + ";";

public string SourceFileName {
get {
var sourceFile = Attributes.Get<SourceFileAttribute> ();
Expand Down
14 changes: 9 additions & 5 deletions src/Xamarin.Android.Tools.Bytecode/Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,21 @@ public ParameterInfo[] GetParameters ()
if (locals != null) {
var names = locals.LocalVariables.Where (p => p.StartPC == 0).ToList ();
int start = 0;
if ((AccessFlags & MethodAccessFlags.Static) == 0)
if (names.Count != parameters.Length &&
!AccessFlags.HasFlag (MethodAccessFlags.Static) &&
names.Count > start &&
names [start].Descriptor == DeclaringType.FullJniName) {
start++; // skip `this` parameter
}
if (!DeclaringType.IsStatic &&
names.Count > start &&
(parameters.Length == 0 || parameters [0].Type.BinaryName != names [start].Descriptor)) {
start++; // JDK 8?
}
if (((AccessFlags & MethodAccessFlags.Synthetic) != MethodAccessFlags.Synthetic) &&
if (!AccessFlags.HasFlag (MethodAccessFlags.Synthetic) &&
((names.Count - start) != parameters.Length) &&
!enumCtor) {
Log.Warning (1,"class-parse: warning: method {0}.{1}{2}: " +
Log.Debug ("class-parse: method {0}.{1}{2}: " +
"Local variables array has {3} entries ('{4}'); descriptor has {5} entries!",
DeclaringType.ThisClass.Name.Value, Name, Descriptor,
names.Count - start,
Expand All @@ -111,7 +115,7 @@ public ParameterInfo[] GetParameters ()
for (int i = 0; i < max; ++i) {
parameters [i].Name = names [start+i].Name;
if (parameters [i].Type.BinaryName != names [start + i].Descriptor) {
Log.Warning (1, "class-parse: warning: method {0}.{1}{2}: " +
Log.Debug ("class-parse: method {0}.{1}{2}: " +
"Local variable type descriptor mismatch! Got '{3}'; expected '{4}'.",
DeclaringType.ThisClass.Name.Value, Name, Descriptor,
parameters [i].Type.BinaryName,
Expand All @@ -122,7 +126,7 @@ public ParameterInfo[] GetParameters ()
var sig = GetSignature ();
if (sig != null) {
if ((sig.Parameters.Count != parameters.Length) && !enumCtor) {
Log.Warning (1,"class-parse: warning: method {0}.{1}{2}: " +
Log.Debug ("class-parse: method {0}.{1}{2}: " +
"Signature ('{3}') has {4} entries; Descriptor '{5}' has {6} entries!",
DeclaringType.ThisClass.Name.Value, Name, Descriptor,
Attributes.Get<SignatureAttribute>(),
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.Bytecode/XmlClassDeclarationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public XElement ToXElement ()
GetExtendsGenericAware (),
new XAttribute ("final", (classFile.AccessFlags & ClassAccessFlags.Final) != 0),
new XAttribute ("name", GetThisClassName ()),
new XAttribute ("jni-signature", "L" + classFile.ThisClass.Name.Value + ";"),
new XAttribute ("jni-signature", classFile.FullJniName),
GetSourceFile (),
new XAttribute ("static", classFile.IsStatic),
new XAttribute ("visibility", GetVisibility (classFile.Visibility)),
Expand Down
98 changes: 98 additions & 0 deletions tests/Xamarin.Android.Tools.Bytecode-Tests/JvmOverloadsConstructorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
using System;
using System.Collections.Generic;
using System.Linq;

using Xamarin.Android.Tools.Bytecode;

using NUnit.Framework;

using Assembly = System.Reflection.Assembly;

namespace Xamarin.Android.Tools.BytecodeTests {

[TestFixture]
public class JvmOverloadsConstructorTests : ClassFileFixture {

const string ClassFile = "JvmOverloadsConstructor.class";
const string XmlFile = "JvmOverloadsConstructor.xml";

[Test]
public void ClassFile_WithJavaType_class ()
{
var c = LoadClassFile (ClassFile);
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MinorVersion = 0,
ConstantPoolCount = 59,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Final | ClassAccessFlags.Super,
FullName = "JvmOverloadsConstructor",
Superclass = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),
Methods = {
new ExpectedMethodDeclaration {
Name = "<init>",
AccessFlags = MethodAccessFlags.Public,
ReturnDescriptor = "V",
Parameters = {
new ParameterInfo ("something", "LJvmOverloadsConstructor;", "LJvmOverloadsConstructor;"),
new ParameterInfo ("id", "I", "I"),
new ParameterInfo ("imageId", "I", "I"),
new ParameterInfo ("title", "Ljava/lang/String;", "Ljava/lang/String;"),
new ParameterInfo ("useDivider", "Z", "Z"),
},
},
new ExpectedMethodDeclaration {
Name = "<init>",
AccessFlags = MethodAccessFlags.Public | MethodAccessFlags.Synthetic,
ReturnDescriptor = "V",
Parameters = {
new ParameterInfo ("p0", "LJvmOverloadsConstructor;", "LJvmOverloadsConstructor;"),
new ParameterInfo ("p1", "I", "I"),
new ParameterInfo ("p2", "I", "I"),
new ParameterInfo ("p3", "Ljava/lang/String;", "Ljava/lang/String;"),
new ParameterInfo ("p4", "Z", "Z"),
new ParameterInfo ("p5", "I", "I"),
new ParameterInfo ("p6", "Lkotlin/jvm/internal/DefaultConstructorMarker;", "Lkotlin/jvm/internal/DefaultConstructorMarker;"),
},
},
new ExpectedMethodDeclaration {
Name = "<init>",
AccessFlags = MethodAccessFlags.Public,
ReturnDescriptor = "V",
Parameters = {
new ParameterInfo ("something", "LJvmOverloadsConstructor;", "LJvmOverloadsConstructor;"),
new ParameterInfo ("id", "I", "I"),
new ParameterInfo ("imageId", "I", "I"),
new ParameterInfo ("title", "Ljava/lang/String;", "Ljava/lang/String;"),
},
},
new ExpectedMethodDeclaration {
Name = "<init>",
AccessFlags = MethodAccessFlags.Public,
ReturnDescriptor = "V",
Parameters = {
new ParameterInfo ("something", "LJvmOverloadsConstructor;", "LJvmOverloadsConstructor;"),
new ParameterInfo ("id", "I", "I"),
new ParameterInfo ("title", "Ljava/lang/String;", "Ljava/lang/String;"),
},
},
new ExpectedMethodDeclaration {
Name = "<init>",
AccessFlags = MethodAccessFlags.Public,
ReturnDescriptor = "V",
Parameters = {
new ParameterInfo ("something", "LJvmOverloadsConstructor;", "LJvmOverloadsConstructor;"),
new ParameterInfo ("title", "Ljava/lang/String;", "Ljava/lang/String;"),
},
},
},
}.Assert (c);
}

[Test]
public void XmlDeclaration_WithJavaType_class ()
{
AssertXmlDeclaration (ClassFile, XmlFile);
}
}
}

162 changes: 162 additions & 0 deletions tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/JvmOverloadsConstructor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
<api
api-source="class-parse">
<package
name=""
jni-name="">
<class
abstract="false"
deprecated="not deprecated"
jni-extends="Ljava/lang/Object;"
extends="java.lang.Object"
extends-generic-aware="java.lang.Object"
final="true"
name="JvmOverloadsConstructor"
jni-signature="LJvmOverloadsConstructor;"
source-file-name="JvmOverloadsConstructor.kt"
static="false"
visibility="public">
<constructor
deprecated="not deprecated"
final="false"
name="JvmOverloadsConstructor"
static="false"
visibility="public"
bridge="false"
synthetic="false"
jni-signature="(LJvmOverloadsConstructor;IILjava/lang/String;)V">
<parameter
name="something"
type="JvmOverloadsConstructor"
jni-type="LJvmOverloadsConstructor;"
not-null="true" />
<parameter
name="id"
type="int"
jni-type="I" />
<parameter
name="imageId"
type="int"
jni-type="I" />
<parameter
name="title"
type="java.lang.String"
jni-type="Ljava/lang/String;"
not-null="true" />
</constructor>
<constructor
deprecated="not deprecated"
final="false"
name="JvmOverloadsConstructor"
static="false"
visibility="public"
bridge="false"
synthetic="false"
jni-signature="(LJvmOverloadsConstructor;IILjava/lang/String;Z)V">
<parameter
name="something"
type="JvmOverloadsConstructor"
jni-type="LJvmOverloadsConstructor;"
not-null="true" />
<parameter
name="id"
type="int"
jni-type="I" />
<parameter
name="imageId"
type="int"
jni-type="I" />
<parameter
name="title"
type="java.lang.String"
jni-type="Ljava/lang/String;"
not-null="true" />
<parameter
name="useDivider"
type="boolean"
jni-type="Z" />
</constructor>
<constructor
deprecated="not deprecated"
final="false"
name="JvmOverloadsConstructor"
static="false"
visibility="public"
bridge="false"
synthetic="true"
jni-signature="(LJvmOverloadsConstructor;IILjava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V">
<parameter
name="p0"
type="JvmOverloadsConstructor"
jni-type="LJvmOverloadsConstructor;" />
<parameter
name="p1"
type="int"
jni-type="I" />
<parameter
name="p2"
type="int"
jni-type="I" />
<parameter
name="p3"
type="java.lang.String"
jni-type="Ljava/lang/String;" />
<parameter
name="p4"
type="boolean"
jni-type="Z" />
<parameter
name="p5"
type="int"
jni-type="I" />
<parameter
name="p6"
type="kotlin.jvm.internal.DefaultConstructorMarker"
jni-type="Lkotlin/jvm/internal/DefaultConstructorMarker;" />
</constructor>
<constructor
deprecated="not deprecated"
final="false"
name="JvmOverloadsConstructor"
static="false"
visibility="public"
bridge="false"
synthetic="false"
jni-signature="(LJvmOverloadsConstructor;ILjava/lang/String;)V">
<parameter
name="something"
type="JvmOverloadsConstructor"
jni-type="LJvmOverloadsConstructor;"
not-null="true" />
<parameter
name="id"
type="int"
jni-type="I" />
<parameter
name="title"
type="java.lang.String"
jni-type="Ljava/lang/String;"
not-null="true" />
</constructor>
<constructor
deprecated="not deprecated"
final="false"
name="JvmOverloadsConstructor"
static="false"
visibility="public"
bridge="false"
synthetic="false"
jni-signature="(LJvmOverloadsConstructor;Ljava/lang/String;)V">
<parameter
name="something"
type="JvmOverloadsConstructor"
jni-type="LJvmOverloadsConstructor;"
not-null="true" />
<parameter
name="title"
type="java.lang.String"
jni-type="Ljava/lang/String;"
not-null="true" />
</constructor>
</class>
</package>
</api>
Binary file added tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/JvmOverloadsConstructor.class
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/JvmOverloadsConstructor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class JvmOverloadsConstructor {
@JvmOverloads
constructor(
something : JvmOverloadsConstructor,
id: Int = 1,
imageId: Int = 2,
title: String,
useDivider: Boolean = false
) {
}
}