jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: improve wildcard types compare (#857)

Browse Source
This commit is contained in:
Skylot
2020-02-17 19:30:29 +00:00
parent 1336c47d18
commit e444ecb2c7
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompare.java
+22 -1
View File
@@ -169,7 +169,12 @@ public class TypeCompare {
if (firstGeneric != secondGeneric) {
return firstGeneric ? NARROW_BY_GENERIC : WIDER_BY_GENERIC;
}
// both generics on same object, compare generics arrays
// both generics on same object
if (first.getWildcardBound() != null && second.getWildcardBound() != null) {
// both wildcards
return compareWildcardTypes(first, second);
}
// compare generics arrays
ArgType[] firstGenericTypes = first.getGenericTypes();
ArgType[] secondGenericTypes = second.getGenericTypes();
int len = firstGenericTypes.length;
@@ -198,6 +203,22 @@ public class TypeCompare {
return TypeCompareEnum.CONFLICT;
}
private TypeCompareEnum compareWildcardTypes(ArgType first, ArgType second) {
WildcardBound firstWildcardBound = first.getWildcardBound();
WildcardBound secondWildcardBound = second.getWildcardBound();
if (firstWildcardBound == WildcardBound.UNBOUND) {
return WIDER;
}
if (secondWildcardBound == WildcardBound.UNBOUND) {
return NARROW;
}
TypeCompareEnum wildcardCompare = compareTypes(first.getWildcardType(), second.getWildcardType());
if (firstWildcardBound == secondWildcardBound) {
return wildcardCompare;
}
return CONFLICT;
}
private TypeCompareEnum compareGenericTypeWithObject(ArgType genericType, ArgType objType) {
List<ArgType> extendTypes = genericType.getExtendTypes();
if (extendTypes == null || extendTypes.isEmpty()) {
jadx-core/src/test/java/jadx/core/dex/visitors/typeinference/TypeCompareTest.java
+19 -3
View File
@@ -12,6 +12,7 @@ import jadx.NotYetImplemented;
import jadx.NotYetImplementedExtension;
import jadx.api.JadxArgs;
import jadx.core.dex.instructions.args.ArgType;
import jadx.core.dex.instructions.args.ArgType.WildcardBound;
import jadx.core.dex.nodes.RootNode;
import static jadx.core.dex.instructions.args.ArgType.BOOLEAN;
@@ -28,6 +29,7 @@ import static jadx.core.dex.instructions.args.ArgType.UNKNOWN_ARRAY;
import static jadx.core.dex.instructions.args.ArgType.UNKNOWN_OBJECT;
import static jadx.core.dex.instructions.args.ArgType.array;
import static jadx.core.dex.instructions.args.ArgType.generic;
import static jadx.core.dex.instructions.args.ArgType.object;
import static jadx.core.dex.instructions.args.ArgType.wildcard;
import static org.assertj.core.api.Assertions.assertThat;
@@ -83,7 +85,7 @@ public class TypeCompareTest {
check(array(OBJECT), array(INT), TypeCompareEnum.CONFLICT);
ArgType integerType = ArgType.object("java.lang.Integer");
ArgType integerType = object("java.lang.Integer");
check(array(OBJECT), array(integerType), TypeCompareEnum.WIDER);
check(array(INT), array(integerType), TypeCompareEnum.CONFLICT);
check(array(INT), array(INT), TypeCompareEnum.EQUAL);
@@ -95,8 +97,8 @@ public class TypeCompareTest {
@Test
public void compareGenerics() {
ArgType mapCls = ArgType.object("java.util.Map");
ArgType setCls = ArgType.object("java.util.Set");
ArgType mapCls = object("java.util.Map");
ArgType setCls = object("java.util.Set");
ArgType keyType = ArgType.genericType("K");
ArgType valueType = ArgType.genericType("V");
@@ -113,6 +115,20 @@ public class TypeCompareTest {
// TODO implement compare for wildcard with bounds
}
@Test
public void compareWildCards() {
ArgType clsWildcard = generic(CLASS.getObject(), wildcard());
ArgType clsExtendedWildcard = generic(CLASS.getObject(), wildcard(STRING, WildcardBound.EXTENDS));
check(clsWildcard, clsExtendedWildcard, TypeCompareEnum.WIDER);
ArgType listWildcard = generic(CLASS.getObject(), wildcard(object("java.util.List"), WildcardBound.EXTENDS));
ArgType collWildcard = generic(CLASS.getObject(), wildcard(object("java.util.Collection"), WildcardBound.EXTENDS));
check(listWildcard, collWildcard, TypeCompareEnum.NARROW);
ArgType collSuperWildcard = generic(CLASS.getObject(), wildcard(object("java.util.Collection"), WildcardBound.SUPER));
check(collSuperWildcard, listWildcard, TypeCompareEnum.CONFLICT);
}
@Test
public void compareGenericTypes() {
ArgType vType = ArgType.genericType("V");