--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/condy/CondyHello.jasm	Tue Mar 13 15:13:20 2018 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+/*
+ * This test uses ldc to load an integer value via a condy bootstrap method.
+ */
+
+class CondyHello
+        version 55:0
+{
+
+public static Method condyBSM:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;"
+        throws java/lang/Throwable
+        stack 4 locals 6
+{
+                sipush          12345;
+                invokestatic    Method java/lang/Integer.valueOf:"(I)Ljava/lang/Integer;";
+                areturn;
+}
+
+public static Method I:"()I"
+        stack 1 locals 0
+{
+                ldc             Dynamic REF_invokeStatic:CondyHello.condyBSM:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;":I:"I";
+                ireturn;
+}
+
+public static Method doit:"()I"
+        stack 4 locals 1
+{
+                invokestatic    Method I:"()I";
+                ireturn;
+}
+
+} // end Class CondyHello 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloApp.java	Tue Mar 13 15:13:20 2018 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+import sun.hotspot.WhiteBox;
+
+public class CondyHelloApp {
+    public static void main(String[] args) throws Throwable {
+        int n;
+        if ((n = CondyHello.doit()) != 12345) {
+            throw new java.lang.RuntimeException("Expected 12345 but got " + n);
+        } else {
+            System.out.println("n = " + n + " (as expected)");
+        }
+        WhiteBox wb = WhiteBox.getWhiteBox();
+        if (wb.isSharedClass(CondyHelloApp.class)) {
+            if (!wb.isSharedClass(CondyHello.class)) {
+                throw new java.lang.RuntimeException("CondyHello should be in shared space but is not.");
+            } else {
+                System.out.println("CondyHello.class is shared (as expected)");
+            }
+        }
+   }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/appcds/condy/CondyHelloTest.java	Tue Mar 13 15:13:20 2018 -0700
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+/*
+ * @test
+ * @summary Make sure CDS works with a minimal test case that uses a CONSTANT_Dynamic constant-pool entry
+ * @requires os.arch != "sparcv9"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @build CondyHello
+ * @build sun.hotspot.WhiteBox CondyHelloTest CondyHelloApp
+ * @run driver ClassFileInstaller -jar condy_hello.jar CondyHello CondyHelloApp
+ * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run main CondyHelloTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CondyHelloTest {
+
+    static String classes[] = {
+        "CondyHello",
+        "CondyHelloApp",
+    };
+
+    public static void main(String[] args) throws Exception {
+        String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar");
+        String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar;
+        String appJar = ClassFileInstaller.getJarPath("condy_hello.jar");
+
+        TestCommon.dump(appJar, TestCommon.list(classes), use_whitebox_jar);
+
+        TestCommon.run("-XX:+UnlockDiagnosticVMOptions",
+                       "-XX:+WhiteBoxAPI",
+                       "-cp", appJar,
+                       use_whitebox_jar,
+                       "CondyHelloApp")
+          .assertNormalExit();
+    }
+}