--- old/src/hotspot/share/runtime/sharedRuntime.hpp	2019-06-03 21:11:14.113438025 -0700
+++ new/src/hotspot/share/runtime/sharedRuntime.hpp	2019-06-03 21:11:13.813427176 -0700
@@ -670,6 +670,7 @@
   address _c2i_value_entry;
   address _c2i_value_ro_entry;
   address _c2i_unverified_entry;
+  address _c2i_unverified_value_entry;
 
   // Support for scalarized value type calling convention
   const GrowableArray<SigEntry>* _sig_cc;
@@ -681,13 +682,15 @@
   int            _saved_code_length;
 #endif
 
-  void init(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry, address c2i_value_entry, address c2i_value_ro_entry, address c2i_unverified_entry) {
+  void init(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry, address c2i_value_entry,
+            address c2i_value_ro_entry, address c2i_unverified_entry, address c2i_unverified_value_entry) {
     _fingerprint = fingerprint;
     _i2c_entry = i2c_entry;
     _c2i_entry = c2i_entry;
     _c2i_value_entry = c2i_value_entry;
     _c2i_value_ro_entry = c2i_value_ro_entry;
     _c2i_unverified_entry = c2i_unverified_entry;
+    _c2i_unverified_value_entry = c2i_unverified_value_entry;
     _sig_cc = NULL;
 #ifdef ASSERT
     _saved_code = NULL;
@@ -706,6 +709,7 @@
   address get_c2i_value_entry()      const { return _c2i_value_entry; }
   address get_c2i_value_ro_entry()   const { return _c2i_value_ro_entry; }
   address get_c2i_unverified_entry() const { return _c2i_unverified_entry; }
+  address get_c2i_unverified_value_entry() const { return _c2i_unverified_value_entry; }
   address base_address();
   void relocate(address new_base);
 
@@ -755,7 +759,8 @@
  public:
 
   static AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint,
-                                        address i2c_entry, address c2i_entry, address c2i_value_entry, address c2i_value_ro_entry, address c2i_unverified_entry);
+                                        address i2c_entry, address c2i_entry, address c2i_value_entry, address c2i_value_ro_entry,
+                                        address c2i_unverified_entry, address c2i_unverified_value_entry);
   static void create_native_wrapper(const methodHandle& method);
   static AdapterHandlerEntry* get_adapter(const methodHandle& method);