--- /dev/null	2016-05-31 09:42:47.975716356 -0700
+++ new/src/jdk.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java	2016-12-09 00:49:05.696271881 -0800
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.graalvm.compiler.hotspot.test;
+
+import static org.graalvm.compiler.core.common.util.ModuleAPI.addExports;
+import static org.graalvm.compiler.core.common.util.ModuleAPI.getModule;
+
+import java.lang.reflect.Method;
+
+import org.graalvm.compiler.core.common.util.Util;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.debug.Debug;
+import org.graalvm.compiler.debug.Debug.Scope;
+import org.graalvm.compiler.graph.Node;
+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 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 {
+
+    @SuppressWarnings("try")
+    protected StructuredGraph test(final String snippet) {
+        ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(getMethod(snippet));
+        try (Scope s = Debug.scope("ConstantPoolSubstitutionsTests", method)) {
+            StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
+            compile(graph.method(), graph);
+            assertNotInGraph(graph, Invoke.class);
+            Debug.dump(Debug.BASIC_LOG_LEVEL, graph, snippet);
+            return graph;
+        } catch (Throwable e) {
+            throw Debug.handle(e);
+        }
+    }
+
+    protected static StructuredGraph assertNotInGraph(StructuredGraph graph, Class<?> clazz) {
+        for (Node node : graph.getNodes()) {
+            if (clazz.isInstance(node)) {
+                fail(node.toString());
+            }
+        }
+        return graph;
+    }
+
+    private static Object getConstantPoolForObject() {
+        String miscPackage = Java8OrEarlier ? "sun.misc" : "jdk.internal.misc";
+        try {
+            Class<?> sharedSecretsClass = Class.forName(miscPackage + ".SharedSecrets");
+            Class<?> javaLangAccessClass = Class.forName(miscPackage + ".JavaLangAccess");
+            Object jla = sharedSecretsClass.getDeclaredMethod("getJavaLangAccess").invoke(null);
+            return javaLangAccessClass.getDeclaredMethod("getConstantPool", Class.class).invoke(jla, Object.class);
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Get the test methods from the generated class.
+     */
+    @Override
+    protected Method getMethod(String methodName) {
+        Class<?> cl;
+        try {
+            cl = LOADER.findClass(AsmLoader.NAME);
+            addExports(cl);
+        } catch (ClassNotFoundException e) {
+            throw new AssertionError(e);
+        }
+        return getMethod(cl, methodName);
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        addExports(AsmLoader.class);
+    }
+
+    /**
+     * This test uses some API hidden by the JDK9 module system.
+     */
+    private static void addExports(Class<?> c) {
+        if (!Util.Java8OrEarlier) {
+            Object javaBaseModule = getModule.invoke(String.class);
+            Object cModule = getModule.invoke(c);
+            addExports.invokeStatic(javaBaseModule, "jdk.internal.reflect", cModule);
+            addExports.invokeStatic(javaBaseModule, "jdk.internal.misc", cModule);
+        }
+    }
+
+    /**
+     * Disables these tests until we know how to dynamically export the {@code jdk.internal.reflect}
+     * package from the {@code java.base} module to the unnamed module associated with
+     * {@link AsmLoader}. Without such an export, the test fails as follows:
+     *
+     * <pre>
+     * Caused by: java.lang.IllegalAccessError: class org.graalvm.compiler.hotspot.test.ConstantPoolTest
+     * (in unnamed module @0x57599b23) cannot access class jdk.internal.reflect.ConstantPool (in
+     * module java.base) because module java.base does not export jdk.internal.reflect to unnamed
+     * module @0x57599b23
+     * </pre>
+     */
+    private static void assumeJDK8() {
+        // Assume.assumeTrue(Java8OrEarlier);
+    }
+
+    @Test
+    public void testGetSize() {
+        assumeJDK8();
+        Object cp = getConstantPoolForObject();
+        test("getSize", cp);
+    }
+
+    @Test
+    public void testGetIntAt() {
+        assumeJDK8();
+        test("getIntAt");
+    }
+
+    @Test
+    public void testGetLongAt() {
+        assumeJDK8();
+        test("getLongAt");
+    }
+
+    @Test
+    public void testGetFloatAt() {
+        assumeJDK8();
+        test("getFloatAt");
+    }
+
+    @Test
+    public void testGetDoubleAt() {
+        assumeJDK8();
+        test("getDoubleAt");
+    }
+
+    // @Test
+    public void testGetUTF8At() {
+        assumeJDK8();
+        test("getUTF8At");
+    }
+
+    private static final String PACKAGE_NAME = ConstantPoolSubstitutionsTests.class.getPackage().getName();
+    private static final String PACKAGE_NAME_INTERNAL = PACKAGE_NAME.replace('.', '/');
+
+    private static AsmLoader LOADER = new AsmLoader(ConstantPoolSubstitutionsTests.class.getClassLoader());
+
+    public static class AsmLoader extends ClassLoader {
+        Class<?> loaded;
+
+        static final String NAME = PACKAGE_NAME + ".ConstantPoolTest";
+
+        public AsmLoader(ClassLoader parent) {
+            super(parent);
+        }
+
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            if (name.equals(NAME)) {
+                if (loaded != null) {
+                    return loaded;
+                }
+                byte[] bytes = generateClass();
+                return (loaded = defineClass(name, bytes, 0, bytes.length));
+            } else {
+                return super.findClass(name);
+            }
+        }
+    }
+
+    // @formatter:off
+    /*
+    static class ConstantPoolTest {
+        public static int getSize(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getSize();
+        }
+
+        public static int getIntAt(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getIntAt(0);
+        }
+
+        public static long getLongAt(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getLongAt(0);
+        }
+
+        public static float getFloatAt(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getFloatAt(0);
+        }
+
+        public static double getDoubleAt(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getDoubleAt(0);
+        }
+
+        public static String getUTF8At(Object o) {
+            ConstantPool cp = (ConstantPool) o;
+            return cp.getUTF8At(0);
+        }
+    }
+    */
+    // @formatter:on
+    private static byte[] generateClass() {
+
+        ClassWriter cw = new ClassWriter(0);
+        MethodVisitor mv;
+
+        cw.visit(52, ACC_SUPER, PACKAGE_NAME_INTERNAL + "/ConstantPoolTest", null, "java/lang/Object", null);
+        cw.visitInnerClass(PACKAGE_NAME_INTERNAL + "/ConstantPoolTest", PACKAGE_NAME_INTERNAL + "/ConstantPoolSubstitutionsTests", "ConstantPoolTest",
+                        ACC_STATIC);
+        String constantPool = Java8OrEarlier ? "sun/reflect/ConstantPool" : "jdk/internal/reflect/ConstantPool";
+
+        mv = cw.visitMethod(0, "<init>", "()V", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+        mv.visitInsn(RETURN);
+        mv.visitMaxs(1, 1);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getSize", "(Ljava/lang/Object;)I", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getSize", "()I", false);
+        mv.visitInsn(IRETURN);
+        mv.visitMaxs(1, 3);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getIntAt", "(Ljava/lang/Object;)I", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitInsn(ICONST_0);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getIntAt", "(I)I", false);
+        mv.visitInsn(IRETURN);
+        mv.visitMaxs(2, 3);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getLongAt", "(Ljava/lang/Object;)J", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitInsn(ICONST_0);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getLongAt", "(I)J", false);
+        mv.visitInsn(LRETURN);
+        mv.visitMaxs(2, 3);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getFloatAt", "(Ljava/lang/Object;)F", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitInsn(ICONST_0);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getFloatAt", "(I)F", false);
+        mv.visitInsn(FRETURN);
+        mv.visitMaxs(2, 3);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getDoubleAt", "(Ljava/lang/Object;)D", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitInsn(ICONST_0);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getDoubleAt", "(I)D", false);
+        mv.visitInsn(DRETURN);
+        mv.visitMaxs(2, 3);
+        mv.visitEnd();
+
+        mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getUTF8At", "(Ljava/lang/Object;)Ljava/lang/String;", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitTypeInsn(CHECKCAST, constantPool);
+        mv.visitVarInsn(ASTORE, 1);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.visitInsn(ICONST_0);
+        mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getUTF8At", "(I)Ljava/lang/String;", false);
+        mv.visitInsn(ARETURN);
+        mv.visitMaxs(2, 3);
+        mv.visitEnd();
+        cw.visitEnd();
+
+        return cw.toByteArray();
+    }
+}