*** old/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java	Fri Jun 10 19:38:05 2016
--- new/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java	Fri Jun 10 19:38:05 2016

*** 122,133 ****
--- 122,133 ----
              ConstantPool constantPool, int cpi) {
          return CTVM.resolveTypeInPool((HotSpotConstantPool) constantPool, cpi);
      }
  
      public static HotSpotResolvedObjectType resolveFieldInPool(
!             ConstantPool constantPool, int cpi, ResolvedJavaMethod method, byte opcode, long[] info) {
!         return CTVM.resolveFieldInPool((HotSpotConstantPool) constantPool, cpi, (HotSpotResolvedJavaMethodImpl) method, opcode, info);
      }
  
      public static int constantPoolRemapInstructionOperandFromCache(
              ConstantPool constantPool, int cpci) {
          return CTVM.constantPoolRemapInstructionOperandFromCache((HotSpotConstantPool) constantPool, cpci);