OSDN Git Service

ART: Allow to set and copy conflicts in the verifier
authorAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 00:22:57 +0000 (17:22 -0700)
committerAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 01:52:56 +0000 (18:52 -0700)
commitc2bf1255ebf360d009dd0763dcea8d2c9b9c676e
tree0ae9b2b41b48a351f90686b9f988fccb48a5e9d1
parenta3cd834a9e63c4c2259f0ef87d79ddf2c4dd3afb
ART: Allow to set and copy conflicts in the verifier

As long as conflicts are not actively being used, it is OK to set
them in a register line or copy them around.

Bug: 22331663

(cherry picked from commit 38536287f61c9c0fc3bab8c1950cf8c74881482a)

Change-Id: I61999e2d9c92f9bdedcb0a5dea54df3c5bb130ca
runtime/verifier/register_line-inl.h
test/800-smali/expected.txt
test/800-smali/smali/b_22331663.smali [new file with mode: 0644]
test/800-smali/src/Main.java