Fix macros with array parameters

Author: nicolasstucki

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -173,7 +173,24 @@ object Splicer {
       sym.signature.paramsSig.map { param =>
         defn.valueTypeNameToJavaType(param) match {
           case Some(clazz) => clazz
-          case None => classLoader.loadClass(param.toString)
+          case None =>
+            def javaArraySig(name: String): String = {
+              if (name.endsWith("[]")) "[" + javaArraySig(name.dropRight(2))
+              else name match {
+                case "scala.Boolean" => "Z"
+                case "scala.Byte" => "B"
+                case "scala.Short" => "S"
+                case "scala.Int" => "I"
+                case "scala.Long" => "J"
+                case "scala.Float" => "F"
+                case "scala.Double" => "D"
+                case "scala.Char" => "C"
+                case paramName => "L" + paramName + ";"
+              }
+            }
+            def javaSig(name: String): String =
+              if (name.endsWith("[]")) javaArraySig(name) else name
+            java.lang.Class.forName(javaSig(param.toString), false, classLoader)
         }
       }
     }

tests/pos/macro-with-array/Macro_1.scala

@@ -0,0 +1,25 @@
+
+object Macro {
+
+  inline def foo1(arr: Array[Boolean]): Unit = ~{ '() }
+  inline def foo2(arr: Array[Byte]): Unit = ~{ '() }
+  inline def foo3(arr: Array[Short]): Unit = ~{ '() }
+  inline def foo4(arr: Array[Int]): Unit = ~{ '() }
+  inline def foo5(arr: Array[Long]): Unit = ~{ '() }
+  inline def foo6(arr: Array[Float]): Unit = ~{ '() }
+  inline def foo7(arr: Array[Double]): Unit = ~{ '() }
+  inline def foo8(arr: Array[Char]): Unit = ~{ '() }
+  inline def foo9(arr: Array[Object]): Unit = ~{ '() }
+  inline def foo10(arr: Array[String]): Unit = ~{ '() }
+  inline def foo11[T](arr: Array[T]): Unit = ~{ '() }
+  inline def foo12(arr: Array[Array[Int]]): Unit = ~{ '() }
+  inline def foo13(arr: Array[Array[String]]): Unit = ~{ '() }
+  inline def foo14(arr: Array[Array[Array[Int]]]): Unit = ~{ '() }
+  inline def foo15(arr: Array[Any]): Unit = ~{ '() }
+  inline def foo16(arr: Array[AnyVal]): Unit = ~{ '() }
+  inline def foo17(arr: Array[AnyRef]): Unit = ~{ '() }
+  inline def foo18(arr: Array[Foo]): Unit = ~{ '() }
+
+}
+
+class Foo

tests/pos/macro-with-array/Test_2.scala

@@ -0,0 +1,20 @@
+object PowerInlined1 {
+  Macro.foo1(Array.empty)
+  Macro.foo2(Array.empty)
+  Macro.foo3(Array.empty)
+  Macro.foo4(Array.empty)
+  Macro.foo5(Array.empty)
+  Macro.foo6(Array.empty)
+  Macro.foo7(Array.empty)
+  Macro.foo8(Array.empty)
+  Macro.foo9(Array.empty)
+  Macro.foo10(Array.empty)
+  Macro.foo11[String](Array.empty)
+  Macro.foo12(Array.empty)
+  Macro.foo13(Array.empty)
+  Macro.foo14(Array.empty)
+  Macro.foo15(Array.empty)
+  Macro.foo16(Array.empty)
+  Macro.foo17(Array.empty)
+  Macro.foo18(Array.empty)
+}