OSDN Git Service

(root) / android-x86 / art.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af8e71d) | patch
ART: Allow array-ness for unresolved merge types
authorAndreas Gampe <agampe@google.com>
Wed, 23 Mar 2016 03:34:25 +0000 (20:34 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 25 Mar 2016 17:43:10 +0000 (10:43 -0700)
commitbb18a03c44d99b3cae232d445d56e80d8388cca9
treec015e2cb8ac1250160cbb68bc48a9fd2b8d3f6catree | snapshot
parentaf8e71d59b0ab5e79f53a608b62b3618e36e6a98commit | diff
ART: Allow array-ness for unresolved merge types

In case component types aren't resolvable, array types won't be
either. They then may be merged. The merge is still potentially
an array type.

Ensure that merging an unresolved array type with a primitive
array type or a non-array type will be resolved to java.lang.Object.

Added tests.

Bug: 27799205
Change-Id: I9beff75318814dddd842abd64ef9a5d2644d801e
12 files changed:
runtime/verifier/method_verifier.cc diff | blob | history
runtime/verifier/reg_type.cc diff | blob | history
runtime/verifier/reg_type.h diff | blob | history
runtime/verifier/reg_type_cache.cc diff | blob | history
test/800-smali/expected.txt diff | blob | history
test/800-smali/smali/b_27799205_1.smali [new file with mode: 0644] blob
test/800-smali/smali/b_27799205_2.smali [new file with mode: 0644] blob
test/800-smali/smali/b_27799205_3.smali [new file with mode: 0644] blob
test/800-smali/smali/b_27799205_4.smali [new file with mode: 0644] blob
test/800-smali/smali/b_27799205_5.smali [new file with mode: 0644] blob
test/800-smali/smali/b_27799205_helper.smali [new file with mode: 0644] blob
test/800-smali/src/Main.java diff | blob | history
art
About OSDN
Find Software
Develop Software
Help