commit | 529781dad1d4bc5685fd9ebbf04c1369246c2403 | [log] [tgz] |
---|---|---|
author | Ian Rogers <irogers@google.com> | Mon Jul 23 17:24:29 2012 -0700 |
committer | Ian Rogers <irogers@google.com> | Tue Jul 24 10:01:45 2012 -0700 |
tree | 1313f6af94e592fc3c0cc7bf7c043f589329d996 | |
parent | ca7fd901bb6b5b014e8b2f3376a06c06a4c7ab87 [diff] |
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