*** old/src/share/vm/classfile/defaultMethods.cpp	Thu Apr 16 13:30:40 2015
--- new/src/share/vm/classfile/defaultMethods.cpp	Thu Apr 16 13:30:40 2015

*** 347,357 ****
--- 347,357 ----
      guarantee(index != NULL && *index >= 0 && *index < _members.length(), "bad index");
      _members.at(*index).second = DISQUALIFIED;
    }
  
    Symbol* generate_no_defaults_message(TRAPS) const;
!   Symbol* generate_method_message(Symbol *klass_name, Method* method, TRAPS) const;
!   Symbol* generate_method_message(Symbol* klass_name, Method* method, TRAPS) const;
    Symbol* generate_conflicts_message(GrowableArray<Method*>* methods, TRAPS) const;
  
   public:
  
    MethodFamily()

*** 494,504 ****
--- 494,504 ----
  
  Symbol* MethodFamily::generate_no_defaults_message(TRAPS) const {
    return SymbolTable::new_symbol("No qualifying defaults found", THREAD);
  }
  
! Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method, TRAPS) const {
! Symbol* MethodFamily::generate_method_message(Symbol* klass_name, Method* method, TRAPS) const {
    stringStream ss;
    ss.print("Method ");
    Symbol* name = method->name();
    Symbol* signature = method->signature();
    ss.write((const char*)klass_name->bytes(), klass_name->utf8_length());

*** 616,627 ****
--- 616,627 ----
  };
  
  static bool already_in_vtable_slots(GrowableArray<EmptyVtableSlot*>* slots, Method* m) {
    bool found = false;
    for (int j = 0; j < slots->length(); ++j) {
!     if (slots->at(j)->name() == m->name() &&
!         slots->at(j)->signature() == m->signature() ) {
!     if (slots->at(j)->name()->equals(m->name()) &&
!         slots->at(j)->signature()->equals(m->signature()) ) {
        found = true;
        break;
      }
    }
    return found;