*** old/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Tue Oct 24 20:29:28 2017
--- new/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp	Tue Oct 24 20:29:28 2017

*** 2715,2725 ****
--- 2715,2726 ----
    Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
    Bytecodes::Code bc = method->java_code_at_bci(bci);
    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");
      Register recv = op->recv()->as_register();
      assert_different_registers(mdo, tmp1, recv);