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

Return one of the original RegisterType instances when merging, if possible

Browse Source
This commit is contained in:
Ben Gruver 2013-03-13 20:39:32 -07:00
parent dd714d9196
commit a555aa0c01
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dexlib2/src/main/java/org/jf/dexlib2/analysis/RegisterType.java
View File

@ -279,6 +279,15 @@ public class RegisterType {
assert other.category == UNKNOWN; assert other.category == UNKNOWN;
return this; return this;
} }
if (mergedType != null) {
if (mergedType.equals(this.type)) {
return this;
}
if (mergedType.equals(other.type)) {
return other;
}
}
return RegisterType.getRegisterType(mergedCategory, mergedType); return RegisterType.getRegisterType(mergedCategory, mergedType);
} }