src/share/vm/prims/methodHandles.cpp

rev 8978 : imported patch remove_err_msg

*** 226,237 ****
          m_klass_non_interface = SystemDictionary::Object_klass();
  #ifdef ASSERT
          { ResourceMark rm;
            Method* m2 = m_klass_non_interface->vtable()->method_at(vmindex);
            assert(m->name() == m2->name() && m->signature() == m2->signature(),
!                  err_msg("at %d, %s != %s", vmindex,
!                          m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string()));
          }
  #endif //ASSERT
        }
        if (!m->is_public()) {
          assert(m->is_public(), "virtual call must be to public interface method");
--- 226,237 ----
          m_klass_non_interface = SystemDictionary::Object_klass();
  #ifdef ASSERT
          { ResourceMark rm;
            Method* m2 = m_klass_non_interface->vtable()->method_at(vmindex);
            assert(m->name() == m2->name() && m->signature() == m2->signature(),
!                  "at %d, %s != %s", vmindex,
!                  m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string());
          }
  #endif //ASSERT
        }
        if (!m->is_public()) {
          assert(m->is_public(), "virtual call must be to public interface method");
*** 343,353 ****
    return (flags & required) == required;
  }
  
  
  Symbol* MethodHandles::signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid) {
!   assert(is_signature_polymorphic_intrinsic(iid), err_msg("iid=%d", iid));
    switch (iid) {
    case vmIntrinsics::_invokeBasic:      return vmSymbols::invokeBasic_name();
    case vmIntrinsics::_linkToVirtual:    return vmSymbols::linkToVirtual_name();
    case vmIntrinsics::_linkToStatic:     return vmSymbols::linkToStatic_name();
    case vmIntrinsics::_linkToSpecial:    return vmSymbols::linkToSpecial_name();
--- 343,353 ----
    return (flags & required) == required;
  }
  
  
  Symbol* MethodHandles::signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid) {
!   assert(is_signature_polymorphic_intrinsic(iid), "iid=%d", iid);
    switch (iid) {
    case vmIntrinsics::_invokeBasic:      return vmSymbols::invokeBasic_name();
    case vmIntrinsics::_linkToVirtual:    return vmSymbols::linkToVirtual_name();
    case vmIntrinsics::_linkToStatic:     return vmSymbols::linkToStatic_name();
    case vmIntrinsics::_linkToSpecial:    return vmSymbols::linkToSpecial_name();
*** 363,373 ****
    case vmIntrinsics::_linkToVirtual:    return JVM_REF_invokeVirtual;
    case vmIntrinsics::_linkToStatic:     return JVM_REF_invokeStatic;
    case vmIntrinsics::_linkToSpecial:    return JVM_REF_invokeSpecial;
    case vmIntrinsics::_linkToInterface:  return JVM_REF_invokeInterface;
    }
!   assert(false, err_msg("iid=%d", iid));
    return 0;
  }
  
  vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(Symbol* name) {
    vmSymbols::SID name_id = vmSymbols::find_sid(name);
--- 363,373 ----
    case vmIntrinsics::_linkToVirtual:    return JVM_REF_invokeVirtual;
    case vmIntrinsics::_linkToStatic:     return JVM_REF_invokeStatic;
    case vmIntrinsics::_linkToSpecial:    return JVM_REF_invokeSpecial;
    case vmIntrinsics::_linkToInterface:  return JVM_REF_invokeInterface;
    }
!   assert(false, "iid=%d", iid);
    return 0;
  }
  
  vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(Symbol* name) {
    vmSymbols::SID name_id = vmSymbols::find_sid(name);
*** 696,706 ****
                          link_info, THREAD);
          } else if (ref_kind == JVM_REF_invokeVirtual) {
            LinkResolver::resolve_virtual_call(result, Handle(), defc,
                          link_info, false, THREAD);
          } else {
!           assert(false, err_msg("ref_kind=%d", ref_kind));
          }
          if (HAS_PENDING_EXCEPTION) {
            return empty;
          }
        }
--- 696,706 ----
                          link_info, THREAD);
          } else if (ref_kind == JVM_REF_invokeVirtual) {
            LinkResolver::resolve_virtual_call(result, Handle(), defc,
                          link_info, false, THREAD);
          } else {
!           assert(false, "ref_kind=%d", ref_kind);
          }
          if (HAS_PENDING_EXCEPTION) {
            return empty;
          }
        }