*** old/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Thu Jun  2 10:38:19 2016
--- new/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantPool.java	Thu Jun  2 10:38:18 2016

*** 585,595 ****
--- 585,595 ----
              return result;
          }
      }
  
      @Override
!     public JavaField lookupField(int cpi, ResolvedJavaMethod method, int opcode) {
          final int index = rawIndexToConstantPoolIndex(cpi, opcode);
          final int nameAndTypeIndex = getNameAndTypeRefIndexAt(index);
          final int nameIndex = getNameRefIndexAt(nameAndTypeIndex);
          String name = lookupUtf8(nameIndex);
          final int typeIndex = getSignatureRefIndexAt(nameAndTypeIndex);

*** 601,611 ****
--- 601,611 ----
  
          if (holder instanceof HotSpotResolvedObjectTypeImpl) {
              long[] info = new long[2];
              HotSpotResolvedObjectTypeImpl resolvedHolder;
              try {
!                 resolvedHolder = compilerToVM().resolveFieldInPool(this, index, (HotSpotResolvedJavaMethodImpl) method, (byte) opcode, info);
              } catch (Throwable t) {
                  /*
                   * If there was an exception resolving the field we give up and return an unresolved
                   * field.
                   */