From a555aa0c0177f26fdd99b1a8b31d80ba104dbe6e Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Wed, 13 Mar 2013 20:39:32 -0700
Subject: [PATCH] Return one of the original RegisterType instances when
 merging, if possible

---
 .../main/java/org/jf/dexlib2/analysis/RegisterType.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

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);
     }