commit 598dcde6c9e64b59ca4cf59e5d1d6d4ffe050402
author Ben Gruver <bgruv@google.com> Thu Oct 04 20:38:18 2012 -0700
committer Ben Gruver <bgruv@google.com> Thu Oct 04 20:38:18 2012 -0700
tree 6d6b87104ccdce27f196c3e976d0dbb6859a70ad
parent 60bb8c675cf4431b78373598b2d7e8527766b58f

Fix a deodex issue when merging an unresolved array type

dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java

diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
index 96878d9..d3f5cdc 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
@@ -402,7 +402,13 @@
         //if the two arrays have the same number of dimensions, then we should return an array class with the
         //same number of dimensions, for the common superclass of the 2 element classes
         if (class1.arrayDimensions == class2.arrayDimensions) {
-            ClassDef commonElementClass = getCommonSuperclass(class1.elementClass, class2.elementClass);
+            ClassDef commonElementClass;
+            if (class1.elementClass instanceof UnresolvedClassDef ||
+                class2.elementClass instanceof UnresolvedClassDef) {
+                commonElementClass = ClassPath.getUnresolvedObjectClassDef();
+            } else {
+                commonElementClass = getCommonSuperclass(class1.elementClass, class2.elementClass);
+            }
             return getArrayClassDefByElementClassAndDimension(commonElementClass, class1.arrayDimensions);
         }