src/share/vm/oops/constantPool.cpp

*** 419,428 ****
--- 419,441 ----
    assert(!tag_at(i).is_invoke_dynamic(), "Must be handled above");
    jint ref_index = *int_at_addr(i);
    return extract_high_short_from_int(ref_index);
  }
  
+ constantTag ConstantPool::impl_tag_ref_at(int which, bool uncached) {
+   int pool_index = which;
+   if (!uncached && cache() != NULL) {
+     if (ConstantPool::is_invokedynamic_index(which)) {
+       // Invokedynamic index is index into resolved_references
+       pool_index = invokedynamic_cp_cache_entry_at(which)->constant_pool_index();
+     } else {
+       // change byte-ordering and go via cache
+       pool_index = remap_instruction_operand_from_cache(which);
+     }
+   }
+   return tag_at(pool_index);
+ }
  
  int ConstantPool::impl_klass_ref_index_at(int which, bool uncached) {
    guarantee(!ConstantPool::is_invokedynamic_index(which),
              "an invokedynamic instruction does not have a klass");
    int i = which;
*** 674,691 ****
--- 687,715 ----
      {
        int ref_kind                 = this_cp->method_handle_ref_kind_at(index);
        int callee_index             = this_cp->method_handle_klass_index_at(index);
        Symbol*  name =      this_cp->method_handle_name_ref_at(index);
        Symbol*  signature = this_cp->method_handle_signature_ref_at(index);
+       constantTag m_tag  = this_cp->tag_at(this_cp->method_handle_index_at(index));
        if (PrintMiscellaneous)
          tty->print_cr("resolve JVM_CONSTANT_MethodHandle:%d [%d/%d/%d] %s.%s",
                        ref_kind, index, this_cp->method_handle_index_at(index),
                        callee_index, name->as_C_string(), signature->as_C_string());
        KlassHandle callee;
        { Klass* k = klass_at_impl(this_cp, callee_index, true, CHECK_NULL);
          callee = KlassHandle(THREAD, k);
        }
+       // Check tag consistency, relax for interface static default method.
+       if ((callee->is_interface() && !m_tag.is_interface_method()) ||
+           (!callee->is_interface() && m_tag.is_interface_method())) {
+         ResourceMark rm(THREAD);
+         char buf[200];
+         jio_snprintf(buf, sizeof(buf), "Inconsistent constant data for %s.%s%s at index %d",
+           callee->name()->as_C_string(), name->as_C_string(), signature->as_C_string(), index);
+         THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+       }
+ 
        KlassHandle klass(THREAD, this_cp->pool_holder());
        Handle value = SystemDictionary::link_method_handle_constant(klass, ref_kind,
                                                                     callee, name, signature,
                                                                     THREAD);
        result_oop = value();