--- old/src/hotspot/cpu/s390/interpreterRT_s390.cpp	2018-03-20 18:39:14.993107143 -0400
+++ new/src/hotspot/cpu/s390/interpreterRT_s390.cpp	2018-03-20 18:39:14.220035398 -0400
@@ -25,6 +25,7 @@
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "interpreter/interp_masm.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
@@ -64,6 +65,11 @@
 }
 
 // Implementation of SignatureHandlerGenerator
+InteprerterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(
+    const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
+  _masm = new MacroAssembler(buffer);
+  _fp_arg_nr = 0;
+}
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_int() {
   int int_arg_nr = jni_offset() - _fp_arg_nr;