commit c1d3bacae473e9c64aada5885d1310f628dcd32c
author Orion Hodson <oth@google.com> Fri Jan 26 14:38:55 2018 +0000
committer Orion Hodson <oth@google.com> Mon Jan 29 09:25:46 2018 +0000
tree 4a50ef63911629de88d04b375c2f3321077ea8f5
parent 26f927518fda8e334e2af2003056b44a9265d5a0

ART: Type conversion fixes for MethodHandles

Remove illegal conversion path from byte to short.

Throw WrongMethodTypeException on later error paths of reference to
primitive conversion.

Bug: 72489224
Test: art/test.py --host -g
Change-Id: Iddca81ee7185bb90cc5e8ab19cfa03ddfb1652ec

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index f2f7c3e..a759cf7 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -691,6 +691,7 @@
         "leb128_test.cc",
         "mem_map_test.cc",
         "memory_region_test.cc",
+        "method_handles_test.cc",
         "mirror/dex_cache_test.cc",
         "mirror/method_type_test.cc",
         "mirror/object_test.cc",
@@ -701,6 +702,7 @@
         "oat_file_assistant_test.cc",
         "parsed_options_test.cc",
         "prebuilt_tools_test.cc",
+        "primitive_test.cc",
         "reference_table_test.cc",
         "runtime_callbacks_test.cc",
         "subtype_check_info_test.cc",