*** old/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java	Thu Jun  2 16:54:05 2016
--- new/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java	Thu Jun  2 16:54:05 2016

*** 265,276 ****
--- 265,277 ----
       * @throws LinkageError if resolution failed
       */
      native HotSpotResolvedObjectTypeImpl resolveTypeInPool(HotSpotConstantPool constantPool, int cpi) throws LinkageError;
  
      /**
!      * Looks up and attempts to resolve the {@code JVM_CONSTANT_Field} entry for at index {@code cpi} in
!      * {@code constantPool}. The values returned in {@code info} are:
!      * {@code constantPool}. For some opcodes, checks are performed that require the {@code method}
+      * that contains {@code opcode} to be specified. The values returned in {@code info} are:
       *
       * <pre>
       *     [(int) flags,   // only valid if field is resolved
       *      (int) offset]  // only valid if field is resolved
       * </pre>

*** 279,289 ****
--- 280,290 ----
       * {@code JVM_CONSTANT_Field} entry.
       *
       * @param info an array in which the details of the field are returned
       * @return the type defining the field if resolution is successful, 0 otherwise
       */
!     native HotSpotResolvedObjectTypeImpl resolveFieldInPool(HotSpotConstantPool constantPool, int cpi, HotSpotResolvedJavaMethodImpl method, byte opcode, long[] info);
  
      /**
       * Converts {@code cpci} from an index into the cache for {@code constantPool} to an index
       * directly into {@code constantPool}.
       *