tree b4527d4d3df8c7628c5e88fadab1b5c286de1b28
parent 9ed820697b75179e236fe5a07981b198a36400b3
author Andreas Gampe <agampe@google.com> 1436847163 -0700
committer Andreas Gampe <agampe@google.com> 1437496245 -0700

ART: Fix UninitializedReference handling

The merge rules in the verifier allowed Object to be successfully
merged with uninitialized references. This is invalid and should
result in a conflict. Fix by moving UninitializedReference rules
earlier.

Also add a test that forward merging is correctly allowed, both
with a valid result as well as a conflict.

Also add tests that backwards branches have the expected behavior.

Bug: 22411633
Change-Id: If837376c15f0b3550d6ce1721a3cde5901c80c7f