Fix names of overloaded methods with ref type parameters

build.sbt

@@ -68,6 +68,9 @@ lazy val plugin = project
   .settings(
     name := "sbt-jni",
     libraryDependencies += "org.ow2.asm" % "asm" % "9.4",
+    libraryDependencies ++= Seq("org.scalactic" %% "scalactic" % "3.2.15" % Test,
+      "org.scalatest" %% "scalatest" % "3.2.15" % Test,
+      "org.scalatest" %% "scalatest-funspec" % "3.2.15" % Test),
     // make project settings available to source
     Compile / sourceGenerators += Def.task {
       val src = s"""|/* Generated by sbt */

plugin/src/main/java/com/github/sbt/jni/javah/util/NativeMethod.java

@@ -47,7 +47,7 @@ private NativeMethod(int access, String name, Type type, String arguments) {
         this.name = name;
         this.type = type;
         this.mangledName = mangleName(name);
-        this.longMangledName = mangledName + "__" + mangleName(arguments);
+        this.longMangledName = mangledName + "__" + mangleArguments(arguments);
     }
 
     @Override

plugin/src/main/java/com/github/sbt/jni/javah/util/Utils.java

@@ -46,29 +46,53 @@ public void close() throws IOException {
         }
     });
 
+    private static void addChar(char ch, StringBuilder builder) {
+        if (ch == '.') {
+            builder.append('_');
+        } else if (ch == '_') {
+            builder.append("_1");
+        } else if (ch == ';') {
+            builder.append("_2");
+        } else if (ch == '[') {
+            builder.append("_3");
+        } else if ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && (ch <= 'Z'))) {
+            builder.append(ch);
+        } else {
+            builder.append(String.format("_0%04x", (int) ch));
+        }
+    }
+
     public static String mangleName(String name) {
         StringBuilder builder = new StringBuilder(name.length() * 2);
         int len = name.length();
         for (int i = 0; i < len; i++) {
-            char ch = name.charAt(i);
-            if (ch == '.') {
+            addChar(name.charAt(i), builder);
+        }
+        return builder.toString();
+    }
+
+    public static String mangleArguments(String arguments) {
+        boolean inObjectType = false;
+        StringBuilder builder = new StringBuilder(arguments.length() * 2);
+        int len = arguments.length();
+        for (int i = 0; i < len; i++) {
+            char ch = arguments.charAt(i);
+            if (inObjectType && ch == ';') {
+                addChar(ch, builder);
+                inObjectType = false;
+            } else if (inObjectType && ch == '/') {
                 builder.append('_');
-            } else if (ch == '_') {
-                builder.append("_1");
-            } else if (ch == ';') {
-                builder.append("_2");
-            } else if (ch == '[') {
-                builder.append("_3");
-            } else if ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && (ch <= 'Z'))) {
-                builder.append(ch);
+            } else if (!inObjectType && ch == 'L') {
+                inObjectType = true;
+                addChar(ch, builder);
             } else {
-                builder.append(String.format("_0%04x", (int) ch));
+                addChar(ch, builder);
             }
         }
         return builder.toString();
     }
 
-    public static String escape(String unicode) {
+                public static String escape(String unicode) {
         Objects.requireNonNull(unicode);
         int len = unicode.length();
         StringBuilder builder = new StringBuilder(len);

plugin/src/main/scala/com/github/sbt/jni/build/CMake.scala

@@ -42,6 +42,7 @@ object CMake extends BuildTool with ConfigureMakeInstall {
       s"-DCMAKE_INSTALL_PREFIX:PATH=${target.getAbsolutePath}",
       "-DCMAKE_BUILD_TYPE=Release",
       "-DSBT:BOOLEAN=true",
+      s"-DJAVA_HOME=${scala.sys.props.get("java.home").get}",
       cmakeVersion.toString,
       baseDirectory.getAbsolutePath
     )

plugin/src/main/scala/com/github/sbt/jni/util/BytecodeUtil.scala

@@ -8,7 +8,7 @@ import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Opcodes}
 
 object BytecodeUtil {
 
-  private class NativeFinder extends ClassVisitor(Opcodes.ASM5) {
+  private class NativeFinder extends ClassVisitor(Opcodes.ASM9) {
 
     // classes found to contain at least one @native def
     val _nativeClasses = new HashSet[String]

plugin/src/test/resources/include/README.md

@@ -0,0 +1 @@
+This directory contains a header file foe the Overloads class that was generated by the javah application of a Java 8 SDK.

plugin/src/test/resources/scala/README.md

@@ -0,0 +1 @@
+This source directory contains source code for producing the class files used in unit tests.

plugin/src/test/resources/scala/com/github/sbt/jni/samples/Overloads.scala

@@ -0,0 +1,16 @@
+package com.github.sbt.jni.samples
+
+private[samples] case class A(x: Int)
+private[samples] case class B(x: Double)
+private[samples] case class C(x: Long)
+
+class Overloads {
+  @native
+  def doSomething(param: A): B
+  @native
+  def doSomething(param: B): A
+  @native
+  def doSomething(param: Array[C]): A
+  @native
+  def doSomething(parma0: Int, param1: Array[C], param2:B, param3: Double): A
+}

plugin/src/test/scala/com/github/sbt/jni/javah/NativeMethodTests.scala

@@ -0,0 +1,44 @@
+package com.github.sbt.jni.javah
+
+import com.github.sbt.jni.javah.util.ClassMetaInfo
+import org.objectweb.asm.ClassReader
+import org.scalatest.funspec.AnyFunSpec
+import scala.jdk.CollectionConverters.asScalaBuffer
+
+import java.io.File
+import java.nio.file.Files
+
+class NativeMethodTests extends AnyFunSpec {
+  this.
+    describe("NativeMethods") {
+      describe("when a method is overloaded") {
+        it("should name methods correctly") {
+          val expectedNames = Set("doSomething__Lcom_github_sbt_jni_samples_A_2",
+            "doSomething__Lcom_github_sbt_jni_samples_B_2",
+            "doSomething___3Lcom_github_sbt_jni_samples_C_2",
+            "doSomething__I_3Lcom_github_sbt_jni_samples_C_2Lcom_github_sbt_jni_samples_B_2D")
+          val methods = asScalaBuffer(NativeMethodTests.classMeta.methods)
+          for (m <- methods) {
+            assert(expectedNames.contains(m.longMangledName()))
+          }
+        }
+      }
+    }
+}
+
+object NativeMethodTests {
+  lazy val classMeta: ClassMetaInfo = {
+    val resource = getClass.getClassLoader.getResource("classes/com/github/sbt/jni/samples/Overloads.class").getPath
+    val f = new File(resource)
+    val meta = new ClassMetaInfo()
+    val stream = Files.newInputStream(f.toPath)
+    try {
+      val reader = new ClassReader(stream)
+      reader.accept(meta, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
+    }
+    finally {
+      stream.close()
+    }
+    meta
+  }
+}