Skip to content

[generator] Fix NRE from return type not getting set for abstract methods with generics. #834

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 4 commits into from
May 13, 2021
Merged

[generator] Fix NRE from return type not getting set for abstract methods with generics. #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a856c2a
[generator] Fix NRE from return type not getting set for abstract met…
jpobst May 11, 2021
a13ab89
Fix unit test?
jonpryor May 12, 2021
ea4df3c
oops
jonpryor May 13, 2021
22efe16
Fixity Fix.
jonpryor May 13, 2021
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
52 changes: 52 additions & 0 deletions tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using generator.SourceWriters;
using MonoDroid.Generation;
using NUnit.Framework;
using Xamarin.Android.Binder;
using Xamarin.SourceWriter;

namespace generatortests
{
Expand Down Expand Up @@ -1271,5 +1273,55 @@ public void WriteClassInternalBase ()
Assert.True (result.Contains ("internal static new IntPtr class_ref".NormalizeLineEndings ()));
Assert.False (result.Contains ("internal static IntPtr class_ref".NormalizeLineEndings ()));
}

[Test]
public void WriteBoundMethodAbstractDeclarationWithGenericReturn ()
{
// Fix a case where the ReturnType of a class method implementing a generic interface method
// that has a generic parameter type return (like T) wasn't getting set, resulting in a NRE.
var gens = ParseApiDefinition (@"<api>
<package name='java.lang' jni-name='java/lang'>
<class abstract='false' deprecated='not deprecated' final='false' name='Object' static='false' visibility='public' jni-signature='Ljava/lang/Object;' />
<interface abstract='false' deprecated='not deprecated' final='false' name='Comparable' static='false' visibility='public' jni-signature='Ljava/lang/Double;' />
</package>

<package name='com.example' jni-name='com/example'>
<interface abstract='true' deprecated='not deprecated' final='false' name='FlowIterator' static='false' visibility='public' jni-signature='Lcom/example/FlowIterator;'>
<typeParameters>
<typeParameter name='R' classBound='java.lang.Object' jni-classBound='Ljava/lang/Object;'></typeParameter>
</typeParameters>
<method abstract='true' deprecated='not deprecated' final='false' name='next' jni-signature='()Ljava/lang/Object;' bridge='false' native='false' return='R' jni-return='TR;' static='false' synchronized='false' synthetic='false' visibility='public' />
</interface>
<class abstract='true' deprecated='not deprecated' extends='java.lang.Object' extends-generic-aware='java.lang.Object' jni-extends='Ljava/lang/Object;' final='false' name='FlowIterator.RangeIterator' static='true' visibility='public' jni-signature='Lcom/example/FlowIterator$RangeIterator;'>
<implements name='com.example.FlowIterator' name-generic-aware='com.example.FlowIterator&lt;T&gt;' jni-type='Lcom/example/FlowIterator&lt;TT;&gt;;'></implements>
<typeParameters>
<typeParameter name='T' interfaceBounds='java.lang.Comparable&lt;T&gt;' jni-interfaceBounds='Ljava/lang/Comparable&lt;TT;&gt;;'>
<genericConstraints>
<genericConstraint type='java.lang.Comparable&lt;T&gt;'></genericConstraint>
</genericConstraints>
</typeParameter>
</typeParameters>
<method abstract='false' deprecated='not deprecated' final='false' name='next' jni-signature='()Ljava/lang/Comparable;' bridge='false' native='false' return='T' jni-return='TT;' static='false' synchronized='false' synthetic='false' visibility='public' />
</class>
</package>
</api>");

var declIface = gens.OfType<InterfaceGen> ().Single (c => c.Name == "IFlowIterator");
var declClass = declIface.NestedTypes.OfType<ClassGen> ().Single (c => c.Name == "FlowIteratorRangeIterator");
var method = declClass.Methods.Single ();

var bmad = new BoundMethodAbstractDeclaration (declClass, method, options, null);
var source_writer = new CodeWriter (writer);

bmad.Write (source_writer);

var expected = @"Java.Lang.Object Com.Example.FlowIteratorRangeIterator.Next ()
{
throw new NotImplementedException ();
}";

// Ignore nullable operator so this test works on all generators ;)
Assert.AreEqual (expected.NormalizeLineEndings (), writer.ToString ().NormalizeLineEndings ().Replace ("?", ""));
}
}
}
5 changes: 3 additions & 2 deletions tools/generator/SourceWriters/BoundMethodAbstractDeclaration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public BoundMethodAbstractDeclaration (GenBase gen, Method method, CodeGeneratio
this.method = method;
this.opt = opt;

ReturnType = new TypeReferenceWriter (opt.GetTypeReferenceName (method.RetVal));
this.AddMethodParameters (method.Parameters, opt);

if (method.RetVal.IsGeneric && gen != null) {
Name = method.Name;
ExplicitInterfaceImplementation = opt.GetOutputName (gen.FullName);
Expand All @@ -35,7 +38,6 @@ public BoundMethodAbstractDeclaration (GenBase gen, Method method, CodeGeneratio
IsAbstract = true;
IsShadow = impl.RequiresNew (method.Name, method);
SetVisibility (method.Visibility);
ReturnType = new TypeReferenceWriter (opt.GetTypeReferenceName (method.RetVal));

NewFirst = true;

Expand All @@ -51,7 +53,6 @@ public BoundMethodAbstractDeclaration (GenBase gen, Method method, CodeGeneratio
Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.ConnectorName, additionalProperties: method.AdditionalAttributeString ()));

SourceWriterExtensions.AddMethodCustomAttributes (Attributes, method);
this.AddMethodParameters (method.Parameters, opt);
}

public override void Write (CodeWriter writer)
Expand Down