*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java	Mon Mar 20 17:38:20 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java	Mon Mar 20 17:38:20 2017

*** 36,52 ****
--- 36,56 ----
  import org.graalvm.compiler.nodes.Invoke;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.junit.BeforeClass;
  import org.junit.Test;
+ import org.objectweb.asm.ClassWriter;
+ import org.objectweb.asm.MethodVisitor;
+ import org.objectweb.asm.Opcodes;
  
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.MethodVisitor;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
- public class ConstantPoolSubstitutionsTests extends GraalCompilerTest implements Opcodes {
+ 
+     public ConstantPoolSubstitutionsTests() {
+         exportPackage(JAVA_BASE, "jdk.internal.org.objectweb.asm");
+     }
  
      @SuppressWarnings("try")
      protected StructuredGraph test(final String snippet) {
          ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(getMethod(snippet));
          try (Scope s = Debug.scope("ConstantPoolSubstitutionsTests", method)) {

*** 184,201 ****
--- 188,206 ----
          protected Class<?> findClass(String name) throws ClassNotFoundException {
              if (name.equals(NAME)) {
                  if (loaded != null) {
                      return loaded;
                  }
!                 byte[] bytes = Gen.generateClass();
                  return (loaded = defineClass(name, bytes, 0, bytes.length));
              } else {
                  return super.findClass(name);
              }
          }
      }
  
+     static class Gen implements Opcodes {
          // @formatter:off
          /*
          static class ConstantPoolTest {
              public static int getSize(Object o) {
                  ConstantPool cp = (ConstantPool) o;

*** 227,237 ****
--- 232,243 ----
                  return cp.getUTF8At(0);
              }
          }
          */
          // @formatter:on
      private static byte[] generateClass() {
+ 
+         static byte[] generateClass() {
  
              ClassWriter cw = new ClassWriter(0);
              MethodVisitor mv;
  
              cw.visit(52, ACC_SUPER, PACKAGE_NAME_INTERNAL + "/ConstantPoolTest", null, "java/lang/Object", null);

*** 319,324 ****
--- 325,331 ----
              mv.visitEnd();
              cw.visitEnd();
  
              return cw.toByteArray();
          }
+     }
  }