Remove unnecessary _fromScalaFunction

#3270 (comment)
scala-native · May 8, 2023 · cc62ca2 · cc62ca2
1 parent e296638
commit cc62ca2
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 89 deletions.
diff --git a/nativelib/src/main/scala/scala/scalanative/unsafe/CFuncPtr.scala b/nativelib/src/main/scala/scala/scalanative/unsafe/CFuncPtr.scala
diff --git a/nativelib/src/main/scala/scala/scalanative/unsafe/CFuncPtr.scala.gyb b/nativelib/src/main/scala/scala/scalanative/unsafe/CFuncPtr.scala.gyb
@@ -33,8 +33,6 @@ object CFuncPtr {
 %   evidences = ", ".join(["ev{}: Tag[T{}]".format(i, i) for i in range(1, N+1)] + ["evRet: Tag[R]"])
 %   CFuncPtrN = "CFuncPtr{}[{}]".format(N, allTps)
 %   FunctionN = "Function{}[{}]".format(N, allTps)
-%   CFuncPtrNWildcard = "CFuncPtr{}[{}]".format(N, wildcards)
-%   FunctionNWildcard = "Function{}[{}]".format(N, wildcards)
 
 final class ${CFuncPtrN} private (rawptr: RawPtr) extends CFuncPtr(rawptr) {
   def apply(${args}): R = intrinsic
@@ -43,8 +41,6 @@ final class ${CFuncPtrN} private (rawptr: RawPtr) extends CFuncPtr(rawptr) {
 object CFuncPtr${N} {
   implicit def fromScalaFunction[${allTps}](fn: ${FunctionN}): ${CFuncPtrN} = intrinsic
 
-  def _fromScalaFunction(fn: ${FunctionNWildcard}): ${CFuncPtrNWildcard} = intrinsic
-
   private[scalanative] def fromRawPtr[${allTps}](ptr: RawPtr): ${CFuncPtrN} = {
     new ${CFuncPtrN}(ptr)
   }

diff --git a/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirDefinitions.scala b/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirDefinitions.scala
@@ -266,12 +266,6 @@ trait NirDefinitions {
           getMember(module, TermName(s"fromScalaFunction"))
       }
 
-    lazy val _CFuncPtrFromFunctionMethods =
-      CFuncPtrNModule.zipWithIndex.map {
-        case (module, n) =>
-          getMember(module, TermName(s"_fromScalaFunction"))
-      }
-
     lazy val CastRawSizeToInt =
       getMember(IntrinsicsModule, TermName("castRawSizeToInt"))
     lazy val CastRawSizeToLong =

diff --git a/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirGenExpr.scala b/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirGenExpr.scala
@@ -1895,7 +1895,7 @@ trait NirGenExpr[G <: nsc.Global with Singleton] { self: NirGenPhase[G] =>
       val Apply(appRec @ Select(receiverp, _), aargs) = app
 
       val paramTypes = app.attachments.get[NonErasedTypes] match {
-        case None => 
+        case None =>
           reporter.error(app.pos, "test")
           Nil
         case Some(NonErasedTypes(paramTys)) => paramTys

diff --git a/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirPrimitives.scala b/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/NirPrimitives.scala
@@ -191,7 +191,6 @@ abstract class NirPrimitives {
 
     addPrimitives(CFuncPtrApplyMethods, CFUNCPTR_APPLY)
     addPrimitives(CFuncPtrFromFunctionMethods, CFUNCPTR_FROM_FUNCTION)
-    addPrimitives(_CFuncPtrFromFunctionMethods, CFUNCPTR_FROM_FUNCTION)
     addPrimitive(ClassFieldRawPtrMethod, CLASS_FIELD_RAWPTR)
     addPrimitives(SizeOfMethods, SIZE_OF)
     addPrimitives(AlignmentOfMethods, ALIGNMENT_OF)

diff --git a/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/PrepNativeInterop.scala b/nscplugin/src/main/scala-2/scala/scalanative/nscplugin/PrepNativeInterop.scala
@@ -212,19 +212,10 @@ abstract class PrepNativeInterop[G <: Global with Singleton](
           )
           super.transform(tree)
 
-        case Apply(TypeApply(fun, tArgs), args) if CFuncPtrFromFunctionMethods.contains(fun.symbol) =>
-          val idx = CFuncPtrFromFunctionMethods.indexOf(fun.symbol)
-          val transformed = _CFuncPtrFromFunctionMethods(idx)
-          val tys = tArgs.map(t => widenDealiasType(t.tpe))
-          typer
-            .typed {
-              Apply(transformed, args: _*)
-            }
-            .updateAttachment(NonErasedTypes(tys))
-            .setPos(tree.pos)
-
         case Apply(fun, args) if CFuncPtrApplyMethods.contains(fun.symbol) =>
-          val paramTypes = args.map(t => widenDealiasType(t.tpe)) :+ widenDealiasType(tree.tpe.finalResultType)
+          val paramTypes =
+            args.map(t => widenDealiasType(t.tpe)) :+
+              widenDealiasType(tree.tpe.finalResultType)
           tree.updateAttachment(NonErasedTypes(paramTypes))
 
         case _ =>

diff --git a/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirDefinitions.scala b/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirDefinitions.scala
@@ -58,7 +58,6 @@ final class NirDefinitions()(using ctx: Context) {
   @tu lazy val CFuncPtrNModules = CFuncPtrNNames.map(requiredModule)
   @tu lazy val CFuncPtr_apply = CFuncPtrNClass.map(_.requiredMethod("apply"))
   @tu lazy val CFuncPtr_fromScalaFunction = CFuncPtrNModules.map(_.requiredMethod("fromScalaFunction"))
-  @tu lazy val _CFuncPtr_fromScalaFunction = CFuncPtrNModules.map(_.requiredMethod("_fromScalaFunction"))
 
   @tu lazy val CStructClasses = (0 to 22).map(n => requiredClass("scala.scalanative.unsafe.CStruct" + n))
   @tu lazy val CArrayClass = requiredClass("scala.scalanative.unsafe.CArray")

diff --git a/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenExpr.scala b/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirGenExpr.scala
@@ -2412,7 +2412,7 @@ trait NirGenExpr(using Context) {
             fn,
             paramTypes
           )
-          
+
           fnRef
 
         case ref: RefTree =>

diff --git a/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirPrimitives.scala b/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/NirPrimitives.scala
@@ -206,7 +206,6 @@ class NirPrimitives(using ctx: Context) extends DottyPrimitives(ctx) {
     addPrimitive(defnNir.Intrinsics_castLongToRawSize, CAST_LONG_TO_RAWSIZE)
     addPrimitives(defnNir.CFuncPtr_apply, CFUNCPTR_APPLY)
     addPrimitives(defnNir.CFuncPtr_fromScalaFunction, CFUNCPTR_FROM_FUNCTION)
-    addPrimitives(defnNir._CFuncPtr_fromScalaFunction, CFUNCPTR_FROM_FUNCTION)
     addPrimitive(defnNir.Intrinsics_classFieldRawPtr, CLASS_FIELD_RAWPTR)
     addPrimitives(defnNir.Intrinsics_sizeOfAlts, SIZE_OF)
     addPrimitives(defnNir.Intrinsics_alignmentOfAlts, ALIGNMENT_OF)

diff --git a/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/PrepNativeInteropLate.scala b/nscplugin/src/main/scala-3/scala/scalanative/nscplugin/PrepNativeInteropLate.scala
@@ -53,29 +53,21 @@ class PostInlineNativeInterop extends PluginPhase {
     def dealiasTypeMapper = DealiasTypeMapper()
 
     tree match
-      // fromScalaFunction[T1, R](fn) -> _fromScalaFunction(fn)
-      case Apply(TypeApply(fun, tArgs), args) if defnNir.CFuncPtr_fromScalaFunction.contains(fun.symbol) =>
-        val idx = defnNir.CFuncPtr_fromScalaFunction.indexOf(fun.symbol)
-        val transformed = defnNir._CFuncPtr_fromScalaFunction(idx)
-        val cls = defnNir.CFuncPtrNClass(idx)
-        val tys = tArgs.map(t => dealiasTypeMapper(t.typeOpt))
-        cpy
-          .Apply(tree)(
-            ref(transformed),
-            args
-          )
-          .withAttachment(NirDefinitions.NonErasedTypes, tys)
-
+      case app @ Apply(TypeApply(fun, tArgs), _)
+          if defnNir.CFuncPtr_fromScalaFunction.contains(fun.symbol) =>
+        val tys = tArgs.map(t => dealiasTypeMapper(t.tpe))
+        app.withAttachment(NirDefinitions.NonErasedTypes, tys)
+
       case Apply(fun, args) if defnNir.CFuncPtr_apply.contains(fun.symbol) =>
-        val paramTypes = args.map(a => dealiasTypeMapper(a.tpe)) :+ dealiasTypeMapper(tree.tpe.finalResultType)
+        val paramTypes =
+          args.map(a => dealiasTypeMapper(a.tpe)) :+
+            dealiasTypeMapper(tree.tpe.finalResultType)
         tree.withAttachment(NirDefinitions.NonErasedTypes, paramTypes)
 
       case _ => tree
 
   }
 
-
-
   override def transformTypeApply(tree: TypeApply)(using Context): Tree = {
     val TypeApply(fun, tArgs) = tree
     val defnNir = this.defnNir