Merge "Adjustments from primitive types to Comparable/Serializable"
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
index 8ea7b67..86ca12a 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -238,6 +238,7 @@
public final DexType callSiteType = createType("Ljava/lang/invoke/CallSite;");
public final DexType lookupType = createType("Ljava/lang/invoke/MethodHandles$Lookup;");
public final DexType serializableType = createType("Ljava/io/Serializable;");
+ public final DexType comparableType = createType("Ljava/lang/Comparable;");
public final DexMethod metafactoryMethod =
createMethod(
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
index 5ea5d0e..45c08fb 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
@@ -126,7 +126,10 @@
// `a` is primitive and `b` is a supertype of the boxed type `a`.
DexType boxedPrimitiveType = getBoxedForPrimitiveType(a);
- if (b == boxedPrimitiveType || b == factory.objectType) {
+ if (b == boxedPrimitiveType ||
+ b == factory.objectType ||
+ b == factory.serializableType ||
+ b == factory.comparableType) {
return true;
}
return boxedPrimitiveType != factory.boxedCharType
@@ -337,6 +340,8 @@
DexType boxedFromType = getBoxedForPrimitiveType(fromType);
if (toType == boxedFromType ||
toType == factory().objectType ||
+ toType == factory().serializableType ||
+ toType == factory().comparableType ||
(boxedFromType != factory().booleanType &&
boxedFromType != factory().charType &&
toType == factory().boxedNumberType)) {
diff --git a/src/test/examplesAndroidO/lambdadesugaring/ValueAdjustments.java b/src/test/examplesAndroidO/lambdadesugaring/ValueAdjustments.java
index f2344b5..1d6772a 100644
--- a/src/test/examplesAndroidO/lambdadesugaring/ValueAdjustments.java
+++ b/src/test/examplesAndroidO/lambdadesugaring/ValueAdjustments.java
@@ -3,6 +3,8 @@
// BSD-style license that can be found in the LICENSE file.
package lambdadesugaring;
+import java.io.Serializable;
+
public class ValueAdjustments {
interface B2i {
int foo(Byte i);
@@ -37,6 +39,22 @@
Number f();
}
+ interface iSerializableOut {
+ Serializable f();
+ }
+
+ interface iSerializableInt {
+ Object f(Serializable s);
+ }
+
+ interface iComparableOut<T> {
+ Comparable<T> f();
+ }
+
+ interface iComparableInt<T> {
+ Object f(Comparable<T> c);
+ }
+
interface iByte {
Byte f();
}
@@ -164,6 +182,30 @@
.append(((iNumber) ValueAdjustments::D).f()).append('\n');
}
+ private static void checkSerializableOut(StringBuffer builder) {
+ builder
+ .append(((iSerializableOut) ValueAdjustments::z).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::c).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::b).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::s).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::i).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::j).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::f).f()).append(' ')
+ .append(((iSerializableOut) ValueAdjustments::d).f()).append(' ');
+ }
+
+ private static void checkComparableOut(StringBuffer builder) {
+ builder
+ .append(((iComparableOut) ValueAdjustments::z).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::c).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::b).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::s).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::i).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::j).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::f).f()).append(' ')
+ .append(((iComparableOut) ValueAdjustments::d).f()).append(' ');
+ }
+
private static void checkBoxes(StringBuffer builder) {
builder
.append(((iBoolean) ValueAdjustments::z).f()).append(' ')
@@ -310,20 +352,44 @@
.append(((BnUnB) ValueAdjustments::boxingAndUnboxingW).foo(true, false, (byte) 1, (byte) 2,
(char) 33, (char) 44, (short) 5, (short) 6, 7, 8, 9, 10L, 11, 12f, 13, 14d))
.append('\n')
+ .append(((BnUnB) ValueAdjustments::allSerializable).foo(true, false, (byte) 1, (byte) 2,
+ (char) 33, (char) 44, (short) 5, (short) 6, 7, 8, 9, 10L, 11, 12f, 13, 14d))
+ .append('\n')
+ .append(((BnUnB) ValueAdjustments::allComparable).foo(true, false, (byte) 1, (byte) 2,
+ (char) 33, (char) 44, (short) 5, (short) 6, 7, 8, 9, 10L, 11, 12f, 13, 14d))
+ .append('\n')
.append(((B2i) (Integer::new)).foo(Byte.valueOf((byte) 44))).append('\n');
}
static String boxingAndUnboxing(Boolean Z, boolean z, Byte B, byte b, Character C, char c,
Short S, short s, Integer I, int i, Long L, long l, Float F, float f, Double D, double d) {
- return "" + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S + ":" + s
- + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
+ return "boxingAndUnboxing: " + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S +
+ ":" + s + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
}
static String boxingAndUnboxingW(boolean Z, boolean z, double B, double b,
double C, double c, double S, double s, double I, double i, double L, double l,
double F, double f, double D, double d) {
- return "" + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S + ":" + s
- + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
+ return "boxingAndUnboxingW: " + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S +
+ ":" + s + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
+ }
+
+ static String allSerializable(
+ Serializable Z, Serializable z, Serializable B, Serializable b,
+ Serializable C, Serializable c, Serializable S, Serializable s,
+ Serializable I, Serializable i, Serializable L, Serializable l,
+ Serializable F, Serializable f, Serializable D, Serializable d) {
+ return "allSerializable: " + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S +
+ ":" + s + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
+ }
+
+ static String allComparable(
+ Comparable Z, Comparable z, Comparable B, Comparable b,
+ Comparable C, Comparable c, Comparable S, Comparable s,
+ Comparable I, Comparable i, Comparable L, Comparable l,
+ Comparable F, Comparable f, Comparable D, Comparable d) {
+ return "allComparable: " + Z + ":" + z + ":" + B + ":" + b + ":" + C + ":" + c + ":" + S +
+ ":" + s + ":" + I + ":" + i + ":" + L + ":" + l + ":" + F + ":" + f + ":" + D + ":" + d;
}
static boolean z() {
@@ -393,7 +459,7 @@
private static void bB70348575(StringBuffer builder) {
B70348575_C1 c1 = new B70348575_C1();
B70348575_A1 a = c1.getB().get();
- builder.append(a.greet()).append('\n');;
+ builder.append(a.greet()).append('\n');
}
public static void main(String[] args) {
@@ -410,6 +476,8 @@
checkBoxes(builder);
checkNumber(builder);
+ checkSerializableOut(builder);
+ checkComparableOut(builder);
checkObject(builder);
checkMisc(builder);
