commit 55c9c4b66ffc9342d1e157cf80614754a8ef1c29
author Ian Rogers <irogers@google.com> Wed Jan 30 17:45:13 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Jan 30 17:45:13 2013 -0800
tree 35d048071e185a716dd4bec60d1467cd9015cff3
parent 98573f907b2f5d1ccb4f6549a487f567599a82d3

Fix invariant check for unresolved super classes.

Change-Id: I31139d665139e7b61573bbfd7650346bb90c8473

src/verifier/reg_type.cc

diff --git a/src/verifier/reg_type.cc b/src/verifier/reg_type.cc
index 56de179..a18c8b1 100644
--- a/src/verifier/reg_type.cc
+++ b/src/verifier/reg_type.cc
@@ -504,8 +504,8 @@
     checked = true;
   }
   if (IsUnresolvedTypes()) {
-    if (IsUnresolvedMergedReference()) {
-      // Unresolved merged types: allocation pc/merged types should be defined.
+    if (IsUnresolvedMergedReference() || IsUnresolvedSuperClass()) {
+      // Unresolved super/merged types: allocation pc/merged types should be defined.
       CHECK(descriptor_.empty()) << *this;
       CHECK(klass_ == NULL) << *this;
       CHECK_NE(allocation_pc_or_constant_or_merged_types_, 0U) << *this;