tree 1313f6af94e592fc3c0cc7bf7c043f589329d996
parent ca7fd901bb6b5b014e8b2f3376a06c06a4c7ab87
author Ian Rogers <irogers@google.com> 1343089469 -0700
committer Ian Rogers <irogers@google.com> 1343149305 -0700

Avoid cases of deriving information from unresolved types giving conflict.

Previously non-trivial merges of unresolved types resulted in conflict
(bottom), introduce a new type to represent this case. Similarly
implement a type for unresolved super classes.

Change-Id: Ib84ba082cb9409ad3acaa49dafbc6b1dd1c7772d