Skip to content

Commit ca5bc84

Browse files
committed
Partially fix null unboxing in lambdas
When unboxing a null to a value class in Scala, the default value of the value class should be returned, before this commit an NPE was thrown instead. Like in scala/scala-java8-compat@d7e0125, we fix this by using BoxesRunTime, bun we don't use it for boxing since it's unnecessary. After this commit, we still throw NPE when unboxing nulls in unspecialized lambdas called in generic contexts (see if3_unspecialized in the added test). This is addressed by the next commits in this PR.
1 parent 7bf86d2 commit ca5bc84

File tree

83 files changed

+241
-151
lines changed

Some content is hidden

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

83 files changed

+241
-151
lines changed

library/src/scala/compat/java8/JFunction0.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ public interface JFunction0<R> extends scala.Function0<R> {
1313
apply();
1414
}
1515
default byte apply$mcB$sp() {
16-
return (Byte) apply();
16+
return scala.runtime.BoxesRunTime.unboxToByte(apply());
1717
}
1818
default short apply$mcS$sp() {
19-
return (Short) apply();
19+
return scala.runtime.BoxesRunTime.unboxToShort(apply());
2020
}
2121
default int apply$mcI$sp() {
22-
return (Integer) apply();
22+
return scala.runtime.BoxesRunTime.unboxToInt(apply());
2323
}
2424
default long apply$mcJ$sp() {
25-
return (Long) apply();
25+
return scala.runtime.BoxesRunTime.unboxToLong(apply());
2626
}
2727
default char apply$mcC$sp() {
28-
return (Character) apply();
28+
return scala.runtime.BoxesRunTime.unboxToChar(apply());
2929
}
3030
default float apply$mcF$sp() {
31-
return (Float) apply();
31+
return scala.runtime.BoxesRunTime.unboxToFloat(apply());
3232
}
3333
default double apply$mcD$sp() {
34-
return (Double) apply();
34+
return scala.runtime.BoxesRunTime.unboxToDouble(apply());
3535
}
3636
default boolean apply$mcZ$sp() {
37-
return (Boolean) apply();
37+
return scala.runtime.BoxesRunTime.unboxToBoolean(apply());
3838
}
3939
}

library/src/scala/compat/java8/JFunction1$mcDD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcDD$sp extends JFunction1 {
1010
abstract double apply$mcDD$sp(double v1);
1111

12-
default Object apply(Object t) { return (Double) apply$mcDD$sp((Double) t); }
12+
default Object apply(Object t) { return (Double) apply$mcDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcDF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcDF$sp extends JFunction1 {
1010
abstract double apply$mcDF$sp(float v1);
1111

12-
default Object apply(Object t) { return (Double) apply$mcDF$sp((Float) t); }
12+
default Object apply(Object t) { return (Double) apply$mcDF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcDI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcDI$sp extends JFunction1 {
1010
abstract double apply$mcDI$sp(int v1);
1111

12-
default Object apply(Object t) { return (Double) apply$mcDI$sp((Integer) t); }
12+
default Object apply(Object t) { return (Double) apply$mcDI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcDJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcDJ$sp extends JFunction1 {
1010
abstract double apply$mcDJ$sp(long v1);
1111

12-
default Object apply(Object t) { return (Double) apply$mcDJ$sp((Long) t); }
12+
default Object apply(Object t) { return (Double) apply$mcDJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcFD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcFD$sp extends JFunction1 {
1010
abstract float apply$mcFD$sp(double v1);
1111

12-
default Object apply(Object t) { return (Float) apply$mcFD$sp((Double) t); }
12+
default Object apply(Object t) { return (Float) apply$mcFD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcFF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcFF$sp extends JFunction1 {
1010
abstract float apply$mcFF$sp(float v1);
1111

12-
default Object apply(Object t) { return (Float) apply$mcFF$sp((Float) t); }
12+
default Object apply(Object t) { return (Float) apply$mcFF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcFI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcFI$sp extends JFunction1 {
1010
abstract float apply$mcFI$sp(int v1);
1111

12-
default Object apply(Object t) { return (Float) apply$mcFI$sp((Integer) t); }
12+
default Object apply(Object t) { return (Float) apply$mcFI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcFJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcFJ$sp extends JFunction1 {
1010
abstract float apply$mcFJ$sp(long v1);
1111

12-
default Object apply(Object t) { return (Float) apply$mcFJ$sp((Long) t); }
12+
default Object apply(Object t) { return (Float) apply$mcFJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcID$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcID$sp extends JFunction1 {
1010
abstract int apply$mcID$sp(double v1);
1111

12-
default Object apply(Object t) { return (Integer) apply$mcID$sp((Double) t); }
12+
default Object apply(Object t) { return (Integer) apply$mcID$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcIF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcIF$sp extends JFunction1 {
1010
abstract int apply$mcIF$sp(float v1);
1111

12-
default Object apply(Object t) { return (Integer) apply$mcIF$sp((Float) t); }
12+
default Object apply(Object t) { return (Integer) apply$mcIF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcII$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcII$sp extends JFunction1 {
1010
abstract int apply$mcII$sp(int v1);
1111

12-
default Object apply(Object t) { return (Integer) apply$mcII$sp((Integer) t); }
12+
default Object apply(Object t) { return (Integer) apply$mcII$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcIJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcIJ$sp extends JFunction1 {
1010
abstract int apply$mcIJ$sp(long v1);
1111

12-
default Object apply(Object t) { return (Integer) apply$mcIJ$sp((Long) t); }
12+
default Object apply(Object t) { return (Integer) apply$mcIJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcJD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcJD$sp extends JFunction1 {
1010
abstract long apply$mcJD$sp(double v1);
1111

12-
default Object apply(Object t) { return (Long) apply$mcJD$sp((Double) t); }
12+
default Object apply(Object t) { return (Long) apply$mcJD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcJF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcJF$sp extends JFunction1 {
1010
abstract long apply$mcJF$sp(float v1);
1111

12-
default Object apply(Object t) { return (Long) apply$mcJF$sp((Float) t); }
12+
default Object apply(Object t) { return (Long) apply$mcJF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcJI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcJI$sp extends JFunction1 {
1010
abstract long apply$mcJI$sp(int v1);
1111

12-
default Object apply(Object t) { return (Long) apply$mcJI$sp((Integer) t); }
12+
default Object apply(Object t) { return (Long) apply$mcJI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcJJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcJJ$sp extends JFunction1 {
1010
abstract long apply$mcJJ$sp(long v1);
1111

12-
default Object apply(Object t) { return (Long) apply$mcJJ$sp((Long) t); }
12+
default Object apply(Object t) { return (Long) apply$mcJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcVD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcVD$sp extends JFunction1 {
1010
abstract void apply$mcVD$sp(double v1);
1111

12-
default Object apply(Object t) { apply$mcVD$sp((Double) t); return scala.runtime.BoxedUnit.UNIT; }
12+
default Object apply(Object t) { apply$mcVD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); return scala.runtime.BoxedUnit.UNIT; }
1313
}

library/src/scala/compat/java8/JFunction1$mcVF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcVF$sp extends JFunction1 {
1010
abstract void apply$mcVF$sp(float v1);
1111

12-
default Object apply(Object t) { apply$mcVF$sp((Float) t); return scala.runtime.BoxedUnit.UNIT; }
12+
default Object apply(Object t) { apply$mcVF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); return scala.runtime.BoxedUnit.UNIT; }
1313
}

library/src/scala/compat/java8/JFunction1$mcVI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcVI$sp extends JFunction1 {
1010
abstract void apply$mcVI$sp(int v1);
1111

12-
default Object apply(Object t) { apply$mcVI$sp((Integer) t); return scala.runtime.BoxedUnit.UNIT; }
12+
default Object apply(Object t) { apply$mcVI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); return scala.runtime.BoxedUnit.UNIT; }
1313
}

library/src/scala/compat/java8/JFunction1$mcVJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcVJ$sp extends JFunction1 {
1010
abstract void apply$mcVJ$sp(long v1);
1111

12-
default Object apply(Object t) { apply$mcVJ$sp((Long) t); return scala.runtime.BoxedUnit.UNIT; }
12+
default Object apply(Object t) { apply$mcVJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); return scala.runtime.BoxedUnit.UNIT; }
1313
}

library/src/scala/compat/java8/JFunction1$mcZD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcZD$sp extends JFunction1 {
1010
abstract boolean apply$mcZD$sp(double v1);
1111

12-
default Object apply(Object t) { return (Boolean) apply$mcZD$sp((Double) t); }
12+
default Object apply(Object t) { return (Boolean) apply$mcZD$sp(scala.runtime.BoxesRunTime.unboxToDouble(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcZF$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcZF$sp extends JFunction1 {
1010
abstract boolean apply$mcZF$sp(float v1);
1111

12-
default Object apply(Object t) { return (Boolean) apply$mcZF$sp((Float) t); }
12+
default Object apply(Object t) { return (Boolean) apply$mcZF$sp(scala.runtime.BoxesRunTime.unboxToFloat(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcZI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcZI$sp extends JFunction1 {
1010
abstract boolean apply$mcZI$sp(int v1);
1111

12-
default Object apply(Object t) { return (Boolean) apply$mcZI$sp((Integer) t); }
12+
default Object apply(Object t) { return (Boolean) apply$mcZI$sp(scala.runtime.BoxesRunTime.unboxToInt(t)); }
1313
}

library/src/scala/compat/java8/JFunction1$mcZJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction1$mcZJ$sp extends JFunction1 {
1010
abstract boolean apply$mcZJ$sp(long v1);
1111

12-
default Object apply(Object t) { return (Boolean) apply$mcZJ$sp((Long) t); }
12+
default Object apply(Object t) { return (Boolean) apply$mcZJ$sp(scala.runtime.BoxesRunTime.unboxToLong(t)); }
1313
}

library/src/scala/compat/java8/JFunction1.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,95 +26,95 @@ default <A> scala.Function1<A, R> compose(scala.Function1<A, T1> g) {
2626
}
2727
@SuppressWarnings("unchecked")
2828
default boolean apply$mcZI$sp(int v1) {
29-
return (Boolean) apply((T1) ((Integer) v1));
29+
return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) ((Integer) v1)));
3030
}
3131
@SuppressWarnings("unchecked")
3232
default int apply$mcII$sp(int v1) {
33-
return (Integer) apply((T1) ((Integer) v1));
33+
return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) ((Integer) v1)));
3434
}
3535
@SuppressWarnings("unchecked")
3636
default float apply$mcFI$sp(int v1) {
37-
return (Float) apply((T1) ((Integer) v1));
37+
return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) ((Integer) v1)));
3838
}
3939
@SuppressWarnings("unchecked")
4040
default long apply$mcJI$sp(int v1) {
41-
return (Long) apply((T1) ((Integer) v1));
41+
return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) ((Integer) v1)));
4242
}
4343
@SuppressWarnings("unchecked")
4444
default double apply$mcDI$sp(int v1) {
45-
return (Double) apply((T1) ((Integer) v1));
45+
return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) ((Integer) v1)));
4646
}
4747
@SuppressWarnings("unchecked")
4848
default void apply$mcVJ$sp(long v1) {
4949
apply((T1) ((Long) v1));
5050
}
5151
@SuppressWarnings("unchecked")
5252
default boolean apply$mcZJ$sp(long v1) {
53-
return (Boolean) apply((T1) ((Long) v1));
53+
return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) ((Long) v1)));
5454
}
5555
@SuppressWarnings("unchecked")
5656
default int apply$mcIJ$sp(long v1) {
57-
return (Integer) apply((T1) ((Long) v1));
57+
return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) ((Long) v1)));
5858
}
5959
@SuppressWarnings("unchecked")
6060
default float apply$mcFJ$sp(long v1) {
61-
return (Float) apply((T1) ((Long) v1));
61+
return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) ((Long) v1)));
6262
}
6363
@SuppressWarnings("unchecked")
6464
default long apply$mcJJ$sp(long v1) {
65-
return (Long) apply((T1) ((Long) v1));
65+
return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) ((Long) v1)));
6666
}
6767
@SuppressWarnings("unchecked")
6868
default double apply$mcDJ$sp(long v1) {
69-
return (Double) apply((T1) ((Long) v1));
69+
return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) ((Long) v1)));
7070
}
7171
@SuppressWarnings("unchecked")
7272
default void apply$mcVF$sp(float v1) {
7373
apply((T1) ((Float) v1));
7474
}
7575
@SuppressWarnings("unchecked")
7676
default boolean apply$mcZF$sp(float v1) {
77-
return (Boolean) apply((T1) ((Float) v1));
77+
return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) ((Float) v1)));
7878
}
7979
@SuppressWarnings("unchecked")
8080
default int apply$mcIF$sp(float v1) {
81-
return (Integer) apply((T1) ((Float) v1));
81+
return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) ((Float) v1)));
8282
}
8383
@SuppressWarnings("unchecked")
8484
default float apply$mcFF$sp(float v1) {
85-
return (Float) apply((T1) ((Float) v1));
85+
return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) ((Float) v1)));
8686
}
8787
@SuppressWarnings("unchecked")
8888
default long apply$mcJF$sp(float v1) {
89-
return (Long) apply((T1) ((Float) v1));
89+
return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) ((Float) v1)));
9090
}
9191
@SuppressWarnings("unchecked")
9292
default double apply$mcDF$sp(float v1) {
93-
return (Double) apply((T1) ((Float) v1));
93+
return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) ((Float) v1)));
9494
}
9595
@SuppressWarnings("unchecked")
9696
default void apply$mcVD$sp(double v1) {
9797
apply((T1) ((Double) v1));
9898
}
9999
@SuppressWarnings("unchecked")
100100
default boolean apply$mcZD$sp(double v1) {
101-
return (Boolean) apply((T1) ((Double) v1));
101+
return scala.runtime.BoxesRunTime.unboxToBoolean(apply((T1) ((Double) v1)));
102102
}
103103
@SuppressWarnings("unchecked")
104104
default int apply$mcID$sp(double v1) {
105-
return (Integer) apply((T1) ((Double) v1));
105+
return scala.runtime.BoxesRunTime.unboxToInt(apply((T1) ((Double) v1)));
106106
}
107107
@SuppressWarnings("unchecked")
108108
default float apply$mcFD$sp(double v1) {
109-
return (Float) apply((T1) ((Double) v1));
109+
return scala.runtime.BoxesRunTime.unboxToFloat(apply((T1) ((Double) v1)));
110110
}
111111
@SuppressWarnings("unchecked")
112112
default long apply$mcJD$sp(double v1) {
113-
return (Long) apply((T1) ((Double) v1));
113+
return scala.runtime.BoxesRunTime.unboxToLong(apply((T1) ((Double) v1)));
114114
}
115115
@SuppressWarnings("unchecked")
116116
default double apply$mcDD$sp(double v1) {
117-
return (Double) apply((T1) ((Double) v1));
117+
return scala.runtime.BoxesRunTime.unboxToDouble(apply((T1) ((Double) v1)));
118118
}
119119

120120
@SuppressWarnings("unchecked")

library/src/scala/compat/java8/JFunction2$mcDDD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDDD$sp extends JFunction2 {
1010
abstract double apply$mcDDD$sp(double v1, double v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDD$sp((Double) v1, (Double) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDDI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDDI$sp extends JFunction2 {
1010
abstract double apply$mcDDI$sp(double v1, int v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDI$sp((Double) v1, (Integer) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDDJ$sp extends JFunction2 {
1010
abstract double apply$mcDDJ$sp(double v1, long v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDJ$sp((Double) v1, (Long) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDDJ$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDID$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDID$sp extends JFunction2 {
1010
abstract double apply$mcDID$sp(int v1, double v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDID$sp((Integer) v1, (Double) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDID$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDII$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDII$sp extends JFunction2 {
1010
abstract double apply$mcDII$sp(int v1, int v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDII$sp((Integer) v1, (Integer) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDII$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDIJ$sp extends JFunction2 {
1010
abstract double apply$mcDIJ$sp(int v1, long v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDIJ$sp((Integer) v1, (Long) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDIJ$sp(scala.runtime.BoxesRunTime.unboxToInt(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDJD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDJD$sp extends JFunction2 {
1010
abstract double apply$mcDJD$sp(long v1, double v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJD$sp((Long) v1, (Double) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJD$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDJI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDJI$sp extends JFunction2 {
1010
abstract double apply$mcDJI$sp(long v1, int v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJI$sp((Long) v1, (Integer) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJI$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcDJJ$sp extends JFunction2 {
1010
abstract double apply$mcDJJ$sp(long v1, long v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJJ$sp((Long) v1, (Long) v2); }
12+
default Object apply(Object v1, Object v2) { return (Double) apply$mcDJJ$sp(scala.runtime.BoxesRunTime.unboxToLong(v1), scala.runtime.BoxesRunTime.unboxToLong(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcFDD$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcFDD$sp extends JFunction2 {
1010
abstract float apply$mcFDD$sp(double v1, double v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Float) apply$mcFDD$sp((Double) v1, (Double) v2); }
12+
default Object apply(Object v1, Object v2) { return (Float) apply$mcFDD$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToDouble(v2)); }
1313
}

library/src/scala/compat/java8/JFunction2$mcFDI$sp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
public interface JFunction2$mcFDI$sp extends JFunction2 {
1010
abstract float apply$mcFDI$sp(double v1, int v2);
1111

12-
default Object apply(Object v1, Object v2) { return (Float) apply$mcFDI$sp((Double) v1, (Integer) v2); }
12+
default Object apply(Object v1, Object v2) { return (Float) apply$mcFDI$sp(scala.runtime.BoxesRunTime.unboxToDouble(v1), scala.runtime.BoxesRunTime.unboxToInt(v2)); }
1313
}

0 commit comments

Comments
 (0)