Add plain function tests to NameOps and Definitions

Author: felixmulder

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -64,7 +64,7 @@ class Compiler {
            new ShortcutImplicits,   // Allow implicit functions without creating closures
            new CrossCastAnd,        // Normalize selections involving intersection types.
            new Splitter,           // Expand selections involving union types into conditionals
-           new SpecializeFunction1), // Specialized Function1 by replacing super with specialized super
+           new SpecializeFunctions), // Specialized Function1 by replacing super with specialized super
       List(new VCInlineMethods,     // Inlines calls to value class methods
            new IsInstanceOfEvaluator, // Issues warnings when unreachable statements are present in match/if expressions
            new SeqLiterals,         // Express vararg arguments as arrays

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -726,12 +726,17 @@ class Definitions {
   def isBottomType(tp: Type) =
     tp.derivesFrom(NothingClass) || tp.derivesFrom(NullClass)
 
-  /** Is a function class.
+  /** Is any function class that satisfies:
    *   - FunctionN for N >= 0
    *   - ImplicitFunctionN for N >= 0
    */
   def isFunctionClass(cls: Symbol) = scalaClassName(cls).isFunction
 
+  /** Is a function class where
+   *    - FunctionN for N >= 0
+   */
+  def isPlainFunctionClass(cls: Symbol) = scalaClassName(cls).isPlainFunction
+
   /** Is an implicit function class.
    *   - ImplicitFunctionN for N >= 0
    */

compiler/src/dotty/tools/dotc/core/NameOps.scala

@@ -240,13 +240,17 @@ object NameOps {
     def functionArity: Int =
       functionArityFor(tpnme.Function) max functionArityFor(tpnme.ImplicitFunction)
 
-    /** Is a function name
+    /** Is any function name that satisfies
      *    - FunctionN for N >= 0
      *    - ImplicitFunctionN for N >= 0
-     *    - false otherwise
      */
     def isFunction: Boolean = functionArity >= 0
 
+    /** Is a function name
+     *    - FunctionN for N >= 0
+     */
+    def isPlainFunction: Boolean = functionArityFor(tpnme.Function) >= 0
+
     /** Is a implicit function name
      *    - ImplicitFunctionN for N >= 0
      *    - false otherwise

compiler/src/dotty/tools/dotc/transform/SpecializeFunction1.scala renamed to compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala

@@ -8,7 +8,7 @@ import Contexts.Context, Types._, Decorators._, Symbols._, DenotTransformers._
 import Denotations._, SymDenotations._, Scopes._, StdNames._, NameOps._, Names._
 import ast.tpd
 
-class SpecializeFunction1 extends MiniPhaseTransform with DenotTransformer {
+class SpecializeFunctions extends MiniPhaseTransform with DenotTransformer {
   import ast.tpd._
 
   val phaseName = "specializeFunction1"
@@ -180,7 +180,7 @@ class SpecializeFunction1 extends MiniPhaseTransform with DenotTransformer {
   // Extractors ----------------------------------------------------------------
   private object ShouldTransformDenot {
     def unapply(cref: ClassDenotation)(implicit ctx: Context): Option[Seq[SpecializationTarget]] =
-      if (!cref.classParents.map(_.symbol).exists(defn.isFunctionClass)) None
+      if (!cref.classParents.map(_.symbol).exists(defn.isPlainFunctionClass)) None
       else Some(getSpecTargets(cref.typeRef))
   }
 
@@ -207,7 +207,7 @@ class SpecializeFunction1 extends MiniPhaseTransform with DenotTransformer {
     val functionParents =
       tpe.classSymbols.iterator
         .flatMap(_.baseClasses)
-        .filter(defn.isFunctionClass)
+        .filter(defn.isPlainFunctionClass)
 
     val tpeCls = tpe.widenDealias
     functionParents.map { sym =>

compiler/test/dotty/tools/dotc/transform/SpecializeFunction1Tests.scala renamed to compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala

@@ -7,7 +7,7 @@ import org.junit.Test
 
 import dotty.tools.backend.jvm.DottyBytecodeTest
 
-class SpecializeFunction1Tests extends DottyBytecodeTest {
+class SpecializeFunctionsTests extends DottyBytecodeTest {
 
   import dotty.tools.backend.jvm.ASMConverters._
   import dotty.tools.backend.jvm.AsmNode._
@@ -89,6 +89,5 @@ class SpecializeFunction1Tests extends DottyBytecodeTest {
         }
         .getOrElse(assert(false, "Could not find constructor for object `Test`"))
     }
-
   }
 }