Fix deprecated code in kotlin metadata
Bug: b/333518767
Change-Id: I5233892589a81a85bbe0a2505e5db718c58c322f
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinClassInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinClassInfo.java
index 0480ba2..0314b43 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinClassInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinClassInfo.java
@@ -129,11 +129,11 @@
KmClass kmClass = metadata.getKmClass();
Map<String, DexEncodedField> fieldMap = new HashMap<>();
for (DexEncodedField field : hostClass.fields()) {
- fieldMap.put(toJvmFieldSignature(field.getReference()).asString(), field);
+ fieldMap.put(toJvmFieldSignature(field.getReference()).toString(), field);
}
Map<String, DexEncodedMethod> methodMap = new HashMap<>();
for (DexEncodedMethod method : hostClass.methods()) {
- methodMap.put(toJvmMethodSignature(method.getReference()).asString(), method);
+ methodMap.put(toJvmMethodSignature(method.getReference()).toString(), method);
}
ImmutableList.Builder<KotlinConstructorInfo> notBackedConstructors = ImmutableList.builder();
KotlinMetadataMembersTracker originalMembersWithKotlinInfo =
@@ -143,7 +143,7 @@
KotlinConstructorInfo.create(kmConstructor, factory, reporter);
JvmMethodSignature signature = JvmExtensionsKt.getSignature(kmConstructor);
if (signature != null) {
- DexEncodedMethod method = methodMap.get(signature.asString());
+ DexEncodedMethod method = methodMap.get(signature.toString());
if (method != null) {
method.setKotlinMemberInfo(constructorInfo);
originalMembersWithKotlinInfo.add(method.getReference());
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinDeclarationContainerInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinDeclarationContainerInfo.java
index b435950..21f5469 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinDeclarationContainerInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinDeclarationContainerInfo.java
@@ -70,10 +70,10 @@
}
KotlinFunctionInfo kotlinFunctionInfo =
KotlinFunctionInfo.create(kmFunction, factory, reporter);
- DexEncodedMethod method = methodSignatureMap.get(signature.asString());
+ DexEncodedMethod method = methodSignatureMap.get(signature.toString());
if (method == null) {
notBackedFunctions.add(kotlinFunctionInfo);
- if (!isValidMethodDescriptor(signature.getDesc())) {
+ if (!isValidMethodDescriptor(signature.getDescriptor())) {
// TODO(b/155536535): Enable this assert.
// appView
// .options()
@@ -98,7 +98,7 @@
boolean hasBacking = false;
if (propertyProcessor.fieldSignature() != null) {
DexEncodedField field =
- fieldSignatureMap.get(propertyProcessor.fieldSignature().asString());
+ fieldSignatureMap.get(propertyProcessor.fieldSignature().toString());
if (field != null) {
hasBacking = true;
field.setKotlinMemberInfo(kotlinPropertyInfo);
@@ -107,7 +107,7 @@
}
if (propertyProcessor.getterSignature() != null) {
DexEncodedMethod method =
- methodSignatureMap.get(propertyProcessor.getterSignature().asString());
+ methodSignatureMap.get(propertyProcessor.getterSignature().toString());
if (method != null) {
hasBacking = true;
keepIfAccessorInline(kmProperty.getGetterFlags(), method, keepByteCode);
@@ -118,7 +118,7 @@
}
if (propertyProcessor.setterSignature() != null) {
DexEncodedMethod method =
- methodSignatureMap.get(propertyProcessor.setterSignature().asString());
+ methodSignatureMap.get(propertyProcessor.setterSignature().toString());
if (method != null) {
hasBacking = true;
keepIfAccessorInline(kmProperty.getGetterFlags(), method, keepByteCode);
@@ -130,7 +130,7 @@
if (propertyProcessor.syntheticMethodForAnnotationsSignature() != null) {
DexEncodedMethod method =
methodSignatureMap.get(
- propertyProcessor.syntheticMethodForAnnotationsSignature().asString());
+ propertyProcessor.syntheticMethodForAnnotationsSignature().toString());
if (method != null) {
hasBacking = true;
method.setKotlinMemberInfo(
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinJvmFieldSignatureInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinJvmFieldSignatureInfo.java
index bcf19a1..2c5598d 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinJvmFieldSignatureInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinJvmFieldSignatureInfo.java
@@ -34,7 +34,7 @@
}
return new KotlinJvmFieldSignatureInfo(
fieldSignature.getName(),
- KotlinTypeReference.fromDescriptor(fieldSignature.getDesc(), factory));
+ KotlinTypeReference.fromDescriptor(fieldSignature.getDescriptor(), factory));
}
boolean rewrite(Consumer<JvmFieldSignature> consumer, DexEncodedField field, AppView<?> appView) {
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinJvmMethodSignatureInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinJvmMethodSignatureInfo.java
index 687156e..917f242 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinJvmMethodSignatureInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinJvmMethodSignatureInfo.java
@@ -51,7 +51,7 @@
return null;
}
String name = methodSignature.getName();
- String descriptor = methodSignature.getDesc();
+ String descriptor = methodSignature.getDescriptor();
if (!KotlinMetadataUtils.isValidMethodDescriptor(descriptor)) {
// If the method descriptor is invalid, keep it as invalid.
return new KotlinJvmMethodSignatureInfo(methodSignature.getName(), descriptor);
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinLambdaInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinLambdaInfo.java
index 09f6a41..77673c0 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinLambdaInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinLambdaInfo.java
@@ -41,7 +41,7 @@
JvmMethodSignature signature = JvmExtensionsKt.getSignature(lambda.function);
if (signature != null) {
for (DexEncodedMethod method : clazz.methods()) {
- if (toJvmMethodSignature(method.getReference()).asString().equals(signature.asString())) {
+ if (toJvmMethodSignature(method.getReference()).toString().equals(signature.toString())) {
method.setKotlinMemberInfo(kotlinFunctionInfo);
return new KotlinLambdaInfo(kotlinFunctionInfo, true);
}
diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinPackageInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinPackageInfo.java
index c4cb846..2771257 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinPackageInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinPackageInfo.java
@@ -45,11 +45,11 @@
Consumer<DexEncodedMethod> keepByteCode) {
Map<String, DexEncodedField> fieldMap = new HashMap<>();
for (DexEncodedField field : clazz.fields()) {
- fieldMap.put(toJvmFieldSignature(field.getReference()).asString(), field);
+ fieldMap.put(toJvmFieldSignature(field.getReference()).toString(), field);
}
Map<String, DexEncodedMethod> methodMap = new HashMap<>();
for (DexEncodedMethod method : clazz.methods()) {
- methodMap.put(toJvmMethodSignature(method.getReference()).asString(), method);
+ methodMap.put(toJvmMethodSignature(method.getReference()).toString(), method);
}
KotlinMetadataMembersTracker originalMembersWithKotlinInfo =
new KotlinMetadataMembersTracker(appView);
