diff --git a/dexlib2/src/main/java/org/jf/dexlib2/analysis/RegisterType.java b/dexlib2/src/main/java/org/jf/dexlib2/analysis/RegisterType.java index 5ad9d3a7..9fb3b2d1 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/analysis/RegisterType.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/analysis/RegisterType.java @@ -279,6 +279,15 @@ public class RegisterType { assert other.category == UNKNOWN; return this; } + + if (mergedType != null) { + if (mergedType.equals(this.type)) { + return this; + } + if (mergedType.equals(other.type)) { + return other; + } + } return RegisterType.getRegisterType(mergedCategory, mergedType); }