--- old/src/hotspot/share/ci/ciMethod.cpp	2019-03-11 14:25:23.658355743 +0100
+++ new/src/hotspot/share/ci/ciMethod.cpp	2019-03-11 14:25:23.446355746 +0100
@@ -47,6 +47,7 @@
 #include "prims/nativeLookup.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/xmlstream.hpp"
 #ifdef COMPILER2
@@ -1420,6 +1421,7 @@
 static BasicType erase_to_word_type(BasicType bt) {
   if (is_subword_type(bt)) return T_INT;
   if (bt == T_ARRAY)       return T_OBJECT;
+  if (bt == T_VALUETYPE)   return T_OBJECT;
   return bt;
 }
 
@@ -1507,3 +1509,16 @@
 }
 
 // ------------------------------------------------------------------
+
+bool ciMethod::has_scalarized_args() const {
+  VM_ENTRY_MARK;
+  return get_Method()->has_scalarized_args();
+}
+
+const GrowableArray<SigEntry>* ciMethod::get_sig_cc() {
+  VM_ENTRY_MARK;
+  if (get_Method()->adapter() == NULL) {
+    return NULL;
+  }
+  return get_Method()->adapter()->get_sig_cc();
+}