wip

Author: OlivierBlanvillain

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

@@ -321,7 +321,7 @@ object Splicer {
     protected def interpretNew(fn: Symbol, args: => List[Result])(implicit env: Env): Result
     protected def unexpectedTree(tree: Tree)(implicit env: Env): Result
 
-    private final def removeEraisedArguments(args: List[Tree], fnTpe: Type): List[Tree] = {
+    private final def removeErasedArguments(args: List[Tree], fnTpe: Type): List[Tree] = {
       var result = args
       var index = 0
       def loop(tp: Type): Unit = tp match {
@@ -336,11 +336,15 @@ object Splicer {
         case tp: MethodType =>
           index += tp.paramInfos.size
           loop(tp.resType)
-        case _ => ()
+        case tp: ExprType =>
+          index += 1
+          loop(tp.resType)
+        case tp => ()
       }
       loop(fnTpe)
-      assert(index == args.size)
+      assert(index == args.size, s"$index != ${args.size}")
       result.filterNot(null.eq)
+      args
     }
 
     protected final def interpretTree(tree: Tree)(implicit env: Env): Result = tree match {
@@ -373,11 +377,11 @@ object Splicer {
           interpretModuleAccess(fn.symbol)
         } else if (fn.symbol.isStatic) {
           val module = fn.symbol.owner
-          def interpretedArgs = removeEraisedArguments(args, fn.tpe).map(arg => interpretTree(arg))
+          def interpretedArgs = removeErasedArguments(args, fn.tpe).map(arg => interpretTree(arg))
           interpretStaticMethodCall(module, fn.symbol, interpretedArgs)
         } else if (fn.qualifier.symbol.is(Module) && fn.qualifier.symbol.isStatic) {
           val module = fn.qualifier.symbol.moduleClass
-          def interpretedArgs = removeEraisedArguments(args, fn.tpe).map(arg => interpretTree(arg))
+          def interpretedArgs = removeErasedArguments(args, fn.tpe).map(arg => interpretTree(arg))
           interpretStaticMethodCall(module, fn.symbol, interpretedArgs)
         } else if (env.contains(fn.name)) {
           env(fn.name)

tests/run-macros/erased-arg-macro/2.scala

@@ -1,10 +1,12 @@
 object Test {
-  assert(Macro.foo1(1) == 0)
-  assert(Macro.foo2(1) == 0)
-  assert(Macro.foo3(1) == 0)
-  assert(Macro.foo4(1) == 0)
-  assert(Macro.foo5(1) == 0)
-  assert(Macro.foo6(1) == 0)
-  assert(Macro.foo7(1) == 0)
-  assert(Macro.foo8(1) == 0)
+  def main(args: Array[String]): Unit = {
+    assert(Macro.foo1(1) == 0)
+    assert(Macro.foo2(1) == 0)
+    assert(Macro.foo3(1) == 0)
+    assert(Macro.foo4(1) == 0)
+    assert(Macro.foo5(1) == 0)
+    assert(Macro.foo6(1) == 0)
+    assert(Macro.foo7(1) == 0)
+    assert(Macro.foo8(1) == 0)
+  }
 }