Skip to content

Commit a421a6e

Browse files
committed
Remove useless JFunctionX
We only need JFunctionX where X <= 2 for specialization.
1 parent 62ad5fb commit a421a6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+22
-510
lines changed

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,8 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
11781178
val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
11791179
if (returnsUnit)
11801180
ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
1181-
else ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
1181+
else if (arity <= 2) ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
1182+
else ctx.requiredClass(("scala.Function" + arity))
11821183
}
11831184
}
11841185
}

library/src/dotty/runtime/function/JFunction.java

Lines changed: 0 additions & 233 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction10.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction11.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction12.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction13.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction14.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction15.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction16.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction17.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction18.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction19.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction20.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction21.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction22.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction3.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction4.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction5.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction6.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction7.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction8.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

library/src/dotty/runtime/function/JFunction9.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

library/src/dotty/runtime/function/JProcedure10.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure11.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure12.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure13.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure14.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure15.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure17.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure18.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure19.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure20.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

library/src/dotty/runtime/function/JProcedure21.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import scala.runtime.BoxedUnit;
99

1010
@FunctionalInterface
11-
public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit>, java.io.Serializable {
11+
public interface JProcedure21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, BoxedUnit>, java.io.Serializable {
1212
default void $init$() {
1313
}
1414

0 commit comments

Comments
 (0)