*** old/src/share/vm/ci/ciEnv.hpp	Wed Oct 12 04:37:38 2011
--- new/src/share/vm/ci/ciEnv.hpp	Wed Oct 12 04:37:38 2011

*** 151,161 ****
--- 151,162 ----
                                       int field_index);
    ciMethod*  get_method_by_index_impl(constantPoolHandle cpool,
                                        int method_index, Bytecodes::Code bc,
                                        ciInstanceKlass* loading_klass);
    ciMethod*  get_fake_invokedynamic_method_impl(constantPoolHandle cpool,
!                                                 int index, Bytecodes::Code bc);
!                                                 int index, Bytecodes::Code bc,
+                                                 ciInstanceKlass* accessor);
  
    // Helper methods
    bool       check_klass_accessibility(ciKlass* accessing_klass,
                                        klassOop resolved_klassOop);
    methodOop  lookup_method(instanceKlass*  accessor,

*** 190,201 ****
--- 191,203 ----
    // Get a ciMethod representing either an unfound method or
    // a method with an unloaded holder.  Ensures uniqueness of
    // the result.
    ciMethod* get_unloaded_method(ciInstanceKlass* holder,
                                  ciSymbol*        name,
!                                 ciSymbol*        signature) {
      return _factory->get_unloaded_method(holder, name, signature);
!                                 ciSymbol*        signature,
+                                 ciInstanceKlass* accessor) {
+     return _factory->get_unloaded_method(holder, name, signature, accessor);
    }
  
    // Get a ciKlass representing an unloaded klass.
    // Ensures uniqueness of the result.
    ciKlass* get_unloaded_klass(ciKlass*  accessing_klass,