--- old/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	2017-10-24 20:29:28.000000000 -0700
+++ new/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	2017-10-24 20:29:28.000000000 -0700
@@ -2717,7 +2717,8 @@
   const bool callee_is_static = callee->is_loaded() && callee->is_static();
   // Perform additional virtual call profiling for invokevirtual and
   // invokeinterface bytecodes.
-  if ((bc == Bytecodes::_invokevirtual || bc == Bytecodes::_invokeinterface) &&
+  if (((bc == Bytecodes::_invokevirtual && !callee->can_be_statically_bound()) ||
+        bc == Bytecodes::_invokeinterface) &&
       !callee_is_static &&  // Required for optimized MH invokes.
       C1ProfileVirtualCalls) {
     assert(op->recv()->is_single_cpu(), "recv must be allocated");