*** old/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java	Fri Jun 10 19:38:05 2016
--- new/test/compiler/jvmci/compilerToVM/ConstantPoolTestCase.java	Fri Jun 10 19:38:05 2016

*** 25,34 ****
--- 25,35 ----
  package compiler.jvmci.compilerToVM;
  
  import java.util.HashMap;
  import java.util.Map;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
  import sun.hotspot.WhiteBox;
  import jdk.internal.reflect.ConstantPool;
  import jdk.internal.reflect.ConstantPool.Tag;
  import compiler.jvmci.compilerToVM.ConstantPoolTestsHelper.DummyClasses;
  import static compiler.jvmci.compilerToVM.ConstantPoolTestCase.ConstantTypes.*;

*** 182,198 ****
--- 183,210 ----
  
      public static class TestedCPEntry {
          public final String klass;
          public final String name;
          public final String type;
+         public final ResolvedJavaMethod[] methods;
          public final byte[] opcodes;
          public final long accFlags;
  
          public TestedCPEntry(String klass, String name, String type, byte[] opcodes, long accFlags) {
+                 this(klass, name, type, null, opcodes, accFlags);
+         }
+ 
+         public TestedCPEntry(String klass, String name, String type, ResolvedJavaMethod[] methods, byte[] opcodes, long accFlags) {
              this.klass = klass;
              this.name = name;
              this.type = type;
+             if (methods != null) {
+                 this.methods = new ResolvedJavaMethod[methods.length];
+                 System.arraycopy(methods, 0, this.methods, 0, methods.length);
+             } else {
+                 this.methods = null;
+             }
              if (opcodes != null) {
                  this.opcodes = new byte[opcodes.length];
                  System.arraycopy(opcodes, 0, this.opcodes, 0, opcodes.length);
              } else {
                  this.opcodes = null;