diff options
| author | Andreas Gampe <agampe@google.com> | 2015-07-09 11:30:14 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-07-09 15:18:13 -0700 |
| commit | 25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8 (patch) | |
| tree | 9e1c4605e49d0e9ee7243696d7a8a98e5897c336 /test/800-smali/src | |
| parent | c08e0c73bb397bc535c299dc0b9062f9ee2d86a0 (diff) | |
| download | art-25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8.zip art-25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8.tar.gz art-25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8.tar.bz2 | |
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
(cherry picked from commit 97a1ff353f254b6e46c7501fe3f0e3254c2517b4)
Change-Id: I9697ce31c1d2ab5aee0433dcf1253bcca79c2983
Diffstat (limited to 'test/800-smali/src')
| -rw-r--r-- | test/800-smali/src/Main.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/800-smali/src/Main.java b/test/800-smali/src/Main.java index e0872c3..709c7f6 100644 --- a/test/800-smali/src/Main.java +++ b/test/800-smali/src/Main.java @@ -97,6 +97,10 @@ public class Main { null, "abc")); testCases.add(new TestCase("b/22331663", "B22331663", "run", new Object[] { false }, null, null)); + testCases.add(new TestCase("b/22331663 (pass)", "B22331663Pass", "run", + new Object[] { false }, null, null)); + testCases.add(new TestCase("b/22331663 (fail)", "B22331663Fail", "run", + new Object[] { false }, new VerifyError(), null)); } public void runTests() { |