--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp	Mon Sep 23 14:39:11 2019 -0400
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp	Mon Sep 23 14:49:04 2019 -0400
@@ -3168,7 +3168,7 @@
     ciType* type = sig->type_at(i);
     BasicType basic_type = type->basic_type();
     // don't allow T_ARRAY to propagate into locals types
-    if (basic_type == T_ARRAY) basic_type = T_OBJECT;
+    if (is_reference_type(basic_type)) basic_type = T_OBJECT;
     ValueType* vt = as_ValueType(basic_type);
     state->store_local(idx, new Local(type, vt, idx, false));
     idx += type->size();