--- old/src/hotspot/share/oops/cpCache.cpp	2018-05-04 04:04:18.336616065 -0400
+++ new/src/hotspot/share/oops/cpCache.cpp	2018-05-04 04:04:16.792527005 -0400
@@ -187,6 +187,7 @@
                          method()->size_of_parameters());
         set_f2_as_vfinal_method(method());
         byte_no = 2;
+        set_f1(method->method_holder()); // interface klass*
         break;
       }
       else {
@@ -251,7 +252,7 @@
     // is executed.
     if (invoke_code != Bytecodes::_invokespecial || !sender_is_interface ||
         method->name() == vmSymbols::object_initializer_name()) {
-    set_bytecode_1(invoke_code);
+      set_bytecode_1(invoke_code);
     }
   } else if (byte_no == 2)  {
     if (change_to_virtual) {