*** old/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java	Fri Jun 10 19:38:02 2016
--- new/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ConstantPool.java	Fri Jun 10 19:38:02 2016

*** 46,65 ****
--- 46,67 ----
       */
      void loadReferencedType(int cpi, int opcode);
  
      /**
       * Looks up a reference to a field. If {@code opcode} is non-negative, then resolution checks
!      * specific to the bytecode it denotes are performed if the field is already resolved. Should
!      * specific to the bytecode it denotes are performed if the field is already resolved. Checks
+      * for some bytecodes require the method that contains the bytecode to be specified. Should
       * any of these checks fail, an unresolved field reference is returned.
       *
       * @param cpi the constant pool index
       * @param opcode the opcode of the instruction for which the lookup is being performed or
       *            {@code -1}
+      * @param method the method for which the lookup is being performed
       * @return a reference to the field at {@code cpi} in this pool
       * @throws ClassFormatError if the entry at {@code cpi} is not a field
       */
!     JavaField lookupField(int cpi, ResolvedJavaMethod method, int opcode);
  
      /**
       * Looks up a reference to a method. If {@code opcode} is non-negative, then resolution checks
       * specific to the bytecode it denotes are performed if the method is already resolved. Should
       * any of these checks fail, an unresolved method reference is returned.