--- old/src/hotspot/share/code/compiledMethod.cpp	2019-05-01 15:26:04.920730054 -0700
+++ new/src/hotspot/share/code/compiledMethod.cpp	2019-05-01 15:26:04.640719884 -0700
@@ -358,7 +358,7 @@
 
       // If value types are passed as fields, use the extended signature
       // which contains the types of all (oop) fields of the value type.
-      if (callee->has_scalarized_args()) {
+      if (this->is_compiled_by_c2() && callee->has_scalarized_args()) {
         const GrowableArray<SigEntry>* sig = callee->adapter()->get_sig_cc();
         assert(sig != NULL, "sig should never be null");
         signature = SigEntry::create_symbol(sig);