ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-29 04:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve register merging in the case of an unresolved type

Browse Source
This commit is contained in:
Ben Gruver 2013-04-08 18:39:55 -07:00
parent 2a206e6f85
commit de7afc64ca
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dexlib/src/main/java/org/jf/dexlib/Code/Analysis/RegisterType.java
View File

@ -271,19 +271,25 @@ public class RegisterType {
Category mergedCategory = Category.mergeTable[this.category.ordinal()][type.category.ordinal()]; Category mergedCategory = Category.mergeTable[this.category.ordinal()][type.category.ordinal()];
ClassDef mergedType = null; ClassDef mergedType = null;
if (this.category == Category.Unknown) {
return type;
}
if (type.category == Category.Unknown) {
return this;
}
if (mergedCategory == Category.Reference) { if (mergedCategory == Category.Reference) {
if (this.category == Category.Null) {
return type;
}
if (type.category == Category.Null) {
return this;
}
if (this.type instanceof ClassPath.UnresolvedClassDef || if (this.type instanceof ClassPath.UnresolvedClassDef ||
type.type instanceof ClassPath.UnresolvedClassDef) { type.type instanceof ClassPath.UnresolvedClassDef) {
mergedType = ClassPath.getUnresolvedObjectClassDef(); mergedType = ClassPath.getUnresolvedObjectClassDef();
} else { } else {
mergedType = ClassPath.getCommonSuperclass(this.type, type.type); mergedType = ClassPath.getCommonSuperclass(this.type, type.type);
} }
} else if (mergedCategory == Category.UninitRef || mergedCategory == Category.UninitThis) {
if (this.category == Category.Unknown) {
return type;
}
assert type.category == Category.Unknown;
return this;
} }
return RegisterType.getRegisterType(mergedCategory, mergedType); return RegisterType.getRegisterType(mergedCategory, mergedType);
} }