*** old/src/share/vm/ci/ciEnv.hpp	Thu Dec  3 11:54:08 2009
--- new/src/share/vm/ci/ciEnv.hpp	Thu Dec  3 11:54:08 2009

*** 119,160 ****
--- 119,166 ----
    ciKlass* get_klass_by_name(ciKlass* accessing_klass,
                               ciSymbol* klass_name,
                               bool require_local);
  
    // Constant pool access.
!   ciKlass*   get_klass_by_index(ciInstanceKlass* loading_klass,
!   ciKlass*   get_klass_by_index(constantPoolHandle cpool,
                                  int klass_index,
!                                 bool& is_accessible);
    ciConstant get_constant_by_index(ciInstanceKlass* loading_klass,
                                     int constant_index);
!                                 bool& is_accessible,
+                                 ciInstanceKlass* loading_klass);
+   ciConstant get_constant_by_index(constantPoolHandle cpool,
+                                    int constant_index,
+                                    ciInstanceKlass* accessor);
    bool       is_unresolved_string(ciInstanceKlass* loading_klass,
                                     int constant_index) const;
    bool       is_unresolved_klass(ciInstanceKlass* loading_klass,
                                     int constant_index) const;
    ciField*   get_field_by_index(ciInstanceKlass* loading_klass,
                                  int field_index);
!   ciMethod*  get_method_by_index(ciInstanceKlass* loading_klass,
!                                  int method_index, Bytecodes::Code bc);
!   ciMethod*  get_method_by_index(constantPoolHandle cpool,
!                                  int method_index, Bytecodes::Code bc,
+                                  ciInstanceKlass* loading_klass);
  
    // Implementation methods for loading and constant pool access.
    ciKlass* get_klass_by_name_impl(ciKlass* accessing_klass,
                                    ciSymbol* klass_name,
                                    bool require_local);
!   ciKlass*   get_klass_by_index_impl(ciInstanceKlass* loading_klass,
!   ciKlass*   get_klass_by_index_impl(constantPoolHandle cpool,
                                       int klass_index,
!                                      bool& is_accessible);
    ciConstant get_constant_by_index_impl(ciInstanceKlass* loading_klass,
                                          int constant_index);
!                                      bool& is_accessible,
+                                      ciInstanceKlass* loading_klass);
+   ciConstant get_constant_by_index_impl(constantPoolHandle cpool,
+                                         int constant_index,
+                                         ciInstanceKlass* loading_klass);
    bool       is_unresolved_string_impl (instanceKlass* loading_klass,
                                          int constant_index) const;
    bool       is_unresolved_klass_impl (instanceKlass* loading_klass,
                                          int constant_index) const;
    ciField*   get_field_by_index_impl(ciInstanceKlass* loading_klass,
                                       int field_index);
!   ciMethod*  get_method_by_index_impl(ciInstanceKlass* loading_klass,
!                                       int method_index, Bytecodes::Code bc);
    ciMethod*  get_fake_invokedynamic_method_impl(ciInstanceKlass* accessor,
!   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);
  
    // Helper methods
    bool       check_klass_accessibility(ciKlass* accessing_klass,
                                        klassOop resolved_klassOop);