--- a/src/hotspot/share/ci/ciMethod.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/ci/ciMethod.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -1454,8 +1454,8 @@
 // ------------------------------------------------------------------
 
 static BasicType erase_to_word_type(BasicType bt) {
-  if (is_subword_type(bt)) return T_INT;
-  if (bt == T_ARRAY)       return T_OBJECT;
+  if (is_subword_type(bt))   return T_INT;
+  if (is_reference_type(bt)) return T_OBJECT;
   return bt;
 }