*** old/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java	Thu Jun  2 16:54:09 2016
--- new/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java	Thu Jun  2 16:54:09 2016

*** 32,41 ****
--- 32,42 ----
   *          java.base/jdk.internal.reflect
   *          java.base/jdk.internal.org.objectweb.asm
   *          java.base/jdk.internal.org.objectweb.asm.tree
   *          jdk.vm.ci/jdk.vm.ci.hotspot
   *          jdk.vm.ci/jdk.vm.ci.meta
+  *          jdk.vm.ci/jdk.vm.ci.runtime
   * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
   * @build sun.hotspot.WhiteBox
   *        compiler.jvmci.compilerToVM.ResolveFieldInPoolTest
   * @run main ClassFileInstaller sun.hotspot.WhiteBox
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission

*** 105,114 ****
--- 106,116 ----
          for (int j = 0; j < entry.opcodes.length; j++) {
              long[] info = new long[2];
              HotSpotResolvedObjectType fieldToVerify
                      = CompilerToVMHelper.resolveFieldInPool(constantPoolCTVM,
                                                             index,
+                                                            entry.methods == null ? null : entry.methods[j],
                                                             entry.opcodes[j],
                                                             info);
              String msg = String.format("Object returned by resolveFieldInPool method"
                                                 + " for %sindex %d  should not be null",
                                         cached,