OSDN Git Service

(root) / android-x86 / art.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c08e0c7) | patch
ART: Change merges with Undefined to Undefined
authorAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 18:30:14 +0000 (11:30 -0700)
committerAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 22:18:13 +0000 (15:18 -0700)
commit25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8
tree9e1c4605e49d0e9ee7243696d7a8a98e5897c336tree | snapshot
parentc08e0c73bb397bc535c299dc0b9062f9ee2d86a0commit | 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

(cherry picked from commit 97a1ff353f254b6e46c7501fe3f0e3254c2517b4)

Change-Id: I9697ce31c1d2ab5aee0433dcf1253bcca79c2983
runtime/verifier/reg_type.cc diff | blob | history
test/800-smali/expected.txt diff | blob | history
test/800-smali/smali/b_22331663_fail.smali [new file with mode: 0644] blob
test/800-smali/smali/b_22331663_pass.smali [new file with mode: 0644] blob
test/800-smali/src/Main.java diff | blob | history
art
About OSDN
Find Software
Develop Software
Help