--- /dev/null	2019-03-11 09:22:42.048915961 +0100
+++ new/test/hotspot/jtreg/runtime/valhalla/valuetypes/classfileparser/BadValueTypes.java	2019-03-11 14:27:58.486353602 +0100
@@ -0,0 +1,96 @@
+/*
+ * 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 test that the right exceptions get thrown for bad value type
+ *          class files.
+ * @compile cfpTests.jcod
+ * @run main/othervm -XX:+EnableValhalla BadValueTypes
+ */
+
+public class BadValueTypes {
+
+    public static void runTest(String test_name, String message) throws Exception {
+        System.out.println("Testing: " + test_name);
+        try {
+            Class newClass = Class.forName(test_name);
+        } catch (java.lang.ClassFormatError e) {
+            if (!e.getMessage().contains(message)) {
+                throw new RuntimeException( "Wrong ClassFormatError: " + e.getMessage());
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        // Test that ACC_VALUE with ACC_ABSTRACT is illegal.
+        runTest("ValueAbstract", "Illegal class modifiers in class ValueAbstract");
+
+        // Test that ACC_VALUE with ACC_ENUM is illegal.
+        runTest("ValueEnum", "Illegal class modifiers in class ValueEnum");
+
+        // Test that value type fields must be final.
+        runTest("ValueFieldNotFinal", "Illegal field modifiers in class ValueFieldNotFinal");
+
+        // Test that arrays cannot have ACC_FLATTENABLE set.
+        runTest("ValueFlatArray", "ACC_FLATTENABLE cannot be specified for an array");
+
+        // Test that a value type cannot have a method named init.
+/* TBD: uncomment when javac stops generating <init>() methods for value types.
+        runTest("ValueInitMethod", "Value Type cannot have a method named <init>");
+*/
+
+        // Test that ACC_VALUE with ACC_INTERFACE is illegal.
+        runTest("ValueInterface", "Illegal class modifiers in class ValueInterface");
+
+        // Test that value type instance methods cannot be synchronized.
+        runTest("ValueMethodSynch", "Method instanceMethod in class ValueMethodSynch has illegal modifiers");
+
+        runTest("ValueSuperClass", "Value type must have java.lang.Object as superclass");
+
+        // Test that ClassCircularityError gets detected for instance fields.
+        System.out.println("Testing ClassCircularityError for instance fields");
+        try {
+            Class newClass = Class.forName("Circ");
+            throw new RuntimeException( "java.lang.ClassCircularityError exception not thrown!");
+        } catch (java.lang.ClassCircularityError e) {
+             if (!e.getMessage().contains("Circ")) {
+                 throw new RuntimeException( "Wrong ClassCircularityError: " + e.getMessage());
+             }
+         }
+
+        // Test that ClassCircularityError gets detected for static fields.
+        System.out.println("Testing ClassCircularityError for static fields");
+        try {
+            Class newClass = Class.forName("CircStaticB");
+            throw new RuntimeException( "java.lang.ClassCircularityError exception not thrown!");
+        } catch (java.lang.ClassCircularityError e) {
+             if (!e.getMessage().contains("CircStatic")) {
+                 throw new RuntimeException( "Wrong ClassCircularityError: " + e.getMessage());
+             }
+         }
+
+        runTest("ValueCloneable", "Value Types do not support Cloneable");
+    }
+}