Use String.length for Record CF methods to support api level 1
Change-Id: I32b96b86adb2426a6904d9c53eef13f5892da4f3
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfMethods.java b/src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfMethods.java
index ed388b8..f64b05b 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfMethods.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfMethods.java
@@ -110,10 +110,10 @@
182,
options.itemFactory.createMethod(
options.itemFactory.stringType,
- options.itemFactory.createProto(options.itemFactory.booleanType),
- options.itemFactory.createString("isEmpty")),
+ options.itemFactory.createProto(options.itemFactory.intType),
+ options.itemFactory.createString("length")),
false),
- new CfIf(If.Type.EQ, ValueType.INT, label1),
+ new CfIf(If.Type.NE, ValueType.INT, label1),
new CfConstNumber(0, ValueType.INT),
new CfNewArray(options.itemFactory.createType("[Ljava/lang/String;")),
new CfGoto(label2),
diff --git a/src/test/java/com/android/tools/r8/desugar/records/RecordMethods.java b/src/test/java/com/android/tools/r8/desugar/records/RecordMethods.java
index a3df3b5..f00657c 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/RecordMethods.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/RecordMethods.java
@@ -13,7 +13,7 @@
public static String toString(
Object[] recordFieldsValues, Class<?> recordClass, String fieldNames) {
// Example: "Person[name=Jane Doe, age=42]"
- String[] fieldNamesSplit = fieldNames.isEmpty() ? new String[0] : fieldNames.split(";");
+ String[] fieldNamesSplit = fieldNames.length() == 0 ? new String[0] : fieldNames.split(";");
StringBuilder builder = new StringBuilder();
builder.append(recordClass.getSimpleName()).append("[");
for (int i = 0; i < fieldNamesSplit.length; i++) {
