*** old/src/share/vm/prims/methodHandles.cpp	Fri Oct 31 13:39:10 2014
--- new/src/share/vm/prims/methodHandles.cpp	Fri Oct 31 13:39:10 2014

*** 268,279 ****
--- 268,277 ----
    // The clazz must be eagerly stored, because it provides a GC
    // root to help keep alive the Method*.
    // If relevant, the vtable or itable value is stored as vmindex.
    // This is done eagerly, since it is readily available without
    // constructing any new objects.
    // TO DO: maybe intern mname_oop
    m->method_holder()->add_member_name(m->method_idnum(), mname);
  
    return mname();
  }
  
  oop MethodHandles::init_field_MemberName(Handle mname, fieldDescriptor& fd, bool is_setter) {

*** 925,1016 ****
--- 923,932 ----
  
    // return number of elements we at leasted wanted to initialize
    return rfill + overflow;
  }
  
  //------------------------------------------------------------------------------
  // MemberNameTable
  //
  
  MemberNameTable::MemberNameTable(int methods_cnt)
                    : GrowableArray<jweak>(methods_cnt, true) {
    assert_locked_or_safepoint(MemberNameTable_lock);
  }
  
  MemberNameTable::~MemberNameTable() {
    assert_locked_or_safepoint(MemberNameTable_lock);
    int len = this->length();
  
    for (int idx = 0; idx < len; idx++) {
      jweak ref = this->at(idx);
      JNIHandles::destroy_weak_global(ref);
    }
  }
  
  void MemberNameTable::add_member_name(int index, jweak mem_name_wref) {
    assert_locked_or_safepoint(MemberNameTable_lock);
    this->at_put_grow(index, mem_name_wref);
  }
  
  // Return a member name oop or NULL.
  oop MemberNameTable::get_member_name(int index) {
    assert_locked_or_safepoint(MemberNameTable_lock);
  
    jweak ref = this->at(index);
    oop mem_name = JNIHandles::resolve(ref);
    return mem_name;
  }
  
  #if INCLUDE_JVMTI
  oop MemberNameTable::find_member_name_by_method(Method* old_method) {
    assert_locked_or_safepoint(MemberNameTable_lock);
    oop found = NULL;
    int len = this->length();
  
    for (int idx = 0; idx < len; idx++) {
      oop mem_name = JNIHandles::resolve(this->at(idx));
      if (mem_name == NULL) {
        continue;
      }
      Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(mem_name);
      if (method == old_method) {
        found = mem_name;
        break;
      }
    }
    return found;
  }
  
  // It is called at safepoint only
  void MemberNameTable::adjust_method_entries(Method** old_methods, Method** new_methods,
                                              int methods_length, bool *trace_name_printed) {
    assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
    // search the MemberNameTable for uses of either obsolete or EMCP methods
    for (int j = 0; j < methods_length; j++) {
      Method* old_method = old_methods[j];
      Method* new_method = new_methods[j];
      oop mem_name = find_member_name_by_method(old_method);
      if (mem_name != NULL) {
        java_lang_invoke_MemberName::adjust_vmtarget(mem_name, new_method);
  
        if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
          if (!(*trace_name_printed)) {
            // RC_TRACE_MESG macro has an embedded ResourceMark
            RC_TRACE_MESG(("adjust: name=%s",
                           old_method->method_holder()->external_name()));
            *trace_name_printed = true;
          }
          // RC_TRACE macro has an embedded ResourceMark
          RC_TRACE(0x00400000, ("MemberName method update: %s(%s)",
                                new_method->name()->as_C_string(),
                                new_method->signature()->as_C_string()));
        }
      }
    }
  }
  #endif // INCLUDE_JVMTI
  
  //
  // Here are the native methods in java.lang.invoke.MethodHandleNatives
  // They are the private interface between this JVM and the HotSpot-specific
  // Java code that implements JSR 292 method handles.
  //