| commit | 97a1ff353f254b6e46c7501fe3f0e3254c2517b4 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 09 11:30:14 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Thu Jul 09 14:36:35 2015 -0700 |
| tree | c4d319c79401442061249055c40f27fbc5d68fdf | |
| parent | f99628f7673c21c42be34f95bef6bbb50cd99f20 [diff] |
ART: Change merges with Undefined to Undefined The result of a merge with an Undefined type should be Undefined. Conflicts are allowed to be copied around, but Undefined registers should not be touched at all, except to be written into. Add a success test case (the register isn't used) and a fail test case (the register is tried to be copied). Bug: 22331663 Bug: 22371999 Change-Id: I9697ce31c1d2ab5aee0433dcf1253bcca79c2983