Make mkArityArray work for classes outside "scala" package

1 files changed, 5 insertions, 4 deletions

diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala
index 0068c0a77..2d9cd5acf 100644
--- a/src/dotty/tools/dotc/core/Definitions.scala
+++ b/src/dotty/tools/dotc/core/Definitions.scala
@@ -78,7 +78,7 @@ class Definitions {
 
   private def mkArityArray(name: String, arity: Int, countFrom: Int): Array[ClassSymbol] = {
     val arr = new Array[ClassSymbol](arity)
-    for (i <- countFrom until arity) arr(i) = ctx.requiredClass("scala." + name + i)
+    for (i <- countFrom until arity) arr(i) = ctx.requiredClass(name + i)
     arr
   }
 
@@ -339,9 +339,10 @@ class Definitions {
 
   // ----- Symbol sets ---------------------------------------------------
 
-  lazy val FunctionClass = mkArityArray("Function", MaxFunctionArity, 0)
-  lazy val TupleClass = mkArityArray("Tuple", MaxTupleArity, 2)
-  lazy val ProductNClass = mkArityArray("Product", MaxTupleArity, 2)
+  lazy val AbstractFunctionClass = mkArityArray("runtime.AbstractFunction", MaxFunctionArity, 0)
+  lazy val FunctionClass = mkArityArray("scala.Function", MaxFunctionArity, 0)
+  lazy val TupleClass = mkArityArray("scala.Tuple", MaxTupleArity, 2)
+  lazy val ProductNClass = mkArityArray("scala.Product", MaxTupleArity, 2)
 
   lazy val FunctionClasses: Set[Symbol] = FunctionClass.toSet
   lazy val TupleClasses: Set[Symbol] = TupleClass.toSet