Fix rewriting of nest host attribute in repackaging
Bug: 165783399
Change-Id: Ie59c62aa5fef4a1a7c7bd7116c678b31e2fa6e1f
diff --git a/src/main/java/com/android/tools/r8/repackaging/RepackagingTreeFixer.java b/src/main/java/com/android/tools/r8/repackaging/RepackagingTreeFixer.java
index 6bde745..8820838 100644
--- a/src/main/java/com/android/tools/r8/repackaging/RepackagingTreeFixer.java
+++ b/src/main/java/com/android/tools/r8/repackaging/RepackagingTreeFixer.java
@@ -69,7 +69,7 @@
fixupType(clazz.superType),
fixupTypeList(clazz.interfaces),
clazz.getSourceFile(),
- fixupNestHost(clazz.getNestHost()),
+ fixupNestHost(clazz.getNestHostClassAttribute()),
fixupNestMemberAttributes(clazz.getNestMembersClassAttributes()),
fixupEnclosingMethodAttribute(clazz.getEnclosingMethodAttribute()),
fixupInnerClassAttributes(clazz.getInnerClasses()),
@@ -197,8 +197,10 @@
.createMethod(fixupType(method.holder), fixupProto(method.proto), method.name);
}
- private NestHostClassAttribute fixupNestHost(DexType type) {
- return type != null ? new NestHostClassAttribute(fixupType(type)) : null;
+ private NestHostClassAttribute fixupNestHost(NestHostClassAttribute nestHostClassAttribute) {
+ return nestHostClassAttribute != null
+ ? new NestHostClassAttribute(fixupType(nestHostClassAttribute.getNestHost()))
+ : null;
}
private List<NestMemberClassAttribute> fixupNestMemberAttributes(
