--- a/src/hotspot/share/prims/methodHandles.cpp Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/prims/methodHandles.cpp Mon Sep 23 14:49:04 2019 -0400
@@ -573,7 +573,7 @@
if (is_subword_type(bt)) {
bsig = vmSymbols::int_signature();
} else {
- assert(bt == T_OBJECT || bt == T_ARRAY, "is_basic_type_signature was false");
+ assert(is_reference_type(bt), "is_basic_type_signature was false");
bsig = vmSymbols::object_signature();
}
} else {
@@ -592,7 +592,7 @@
if (arg_pos == keep_arg_pos) {
buffer.write((char*) ss.raw_bytes(),
(int) ss.raw_length());
- } else if (bt == T_OBJECT || bt == T_ARRAY) {
+ } else if (is_reference_type(bt)) {
buffer.write(OBJ_SIG, OBJ_SIG_LEN);
} else {
if (is_subword_type(bt))