8d8fc48664205e433cfa5540753b38043d918873 - platform/art

commit	8d8fc48664205e433cfa5540753b38043d918873	[log] [tgz]
author	Andreas Gampe <agampe@google.com>	Fri Mar 25 16:24:20 2016 -0700
committer	Andreas Gampe <agampe@google.com>	Fri Mar 25 16:50:15 2016 -0700
tree	5662cfe24c49f244672bf0f69575758791765314
parent	0a4d6b9faaaa2652c42679df2a72c78485ed9c64 [diff]

ART: Relax verifier checks

Only bail for unresolved merge types in a couple of cases. Follow-up
to bb18a03c44d99b3cae232d445d56e80d8388cca9.

Bug: 27799205
Change-Id: If448e14036bc5e245677e0cd8cdddee02b320525

runtime/verifier/method_verifier.cc[diff]
runtime/verifier/reg_type.cc[diff]
runtime/verifier/reg_type_cache.cc[diff]
test/800-smali/expected.txt[diff]
test/800-smali/smali/b_27799205_6.smali[Added - diff]
test/800-smali/smali/b_27799205_helper.smali[diff]
test/800-smali/src/Main.java[diff]

7 files changed

tree: 5662cfe24c49f244672bf0f69575758791765314