--- old/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	2017-10-25 15:12:00.000000000 -0700
+++ new/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp	2017-10-25 15:11:59.000000000 -0700
@@ -2774,13 +2774,9 @@
     __ add_const_optimized(mdo, mdo, mdo_offset_bias, R0);
   }
 
-  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) &&
-      !callee_is_static &&  // Required for optimized MH invokes.
-      C1ProfileVirtualCalls) {
+  // invokeinterface bytecodes
+  if (op->should_profile_receiver_type()) {
     assert(op->recv()->is_single_cpu(), "recv must be allocated");
     Register recv = op->recv()->as_register();
     assert_different_registers(mdo, tmp1, recv);