--- /dev/null	2019-03-11 09:22:42.048915961 +0100
+++ new/test/hotspot/jtreg/compiler/valhalla/valuetypes/TestJNICalls.java	2019-03-11 14:27:36.486353906 +0100
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2019, 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 compiler.valhalla.valuetypes;
+
+import jdk.test.lib.Asserts;
+
+import java.lang.reflect.Method;
+
+/*
+ * @test
+ * @summary Test calling native methods with value type arguments from compiled code.
+ * @library /testlibrary /test/lib /compiler/whitebox /
+ * @requires os.simpleArch == "x64"
+ * @compile -XDallowWithFieldOperator TestJNICalls.java
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.Platform
+ * @run main/othervm/timeout=120 -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                               -XX:+UnlockExperimentalVMOptions -XX:+WhiteBoxAPI -XX:+EnableValhalla
+ *                               compiler.valhalla.valuetypes.ValueTypeTest
+ *                               compiler.valhalla.valuetypes.TestJNICalls
+ */
+public class TestJNICalls extends ValueTypeTest {
+    // Extra VM parameters for some test scenarios. See ValueTypeTest.getVMParameters()
+    @Override
+    public String[] getExtraVMParameters(int scenario) {
+        return null;
+    }
+
+    public static void main(String[] args) throws Throwable {
+        TestJNICalls test = new TestJNICalls();
+        test.run(args, MyValue1.class);
+    }
+
+    static {
+        System.loadLibrary("TestJNICalls");
+    }
+
+    public native Object testMethod1(MyValue1 o);
+    public native long testMethod2(MyValue1 o);
+
+    // Pass a value type to a native method that calls back into Java code and returns a value
+    @Test
+    @Warmup(10000) // Make sure native method is compiled
+    public MyValue1 test1(MyValue1 vt, boolean callback) {
+        if (!callback) {
+          return (MyValue1)testMethod1(vt);
+        } else {
+          return vt;
+        }
+    }
+
+    @DontCompile
+    public void test1_verifier(boolean warmup) {
+        MyValue1 vt = MyValue1.createWithFieldsInline(rI, rL);
+        MyValue1 result = test1(vt, false);
+        Asserts.assertEQ(result.hash(), vt.hash());
+        result = test1(vt, true);
+        Asserts.assertEQ(result.hash(), vt.hash());
+    }
+
+    // Pass a value type to a native method that calls the hash method and returns the result
+    @Test
+    @Warmup(10000) // Make sure native method is compiled
+    public long test2(MyValue1 vt) {
+        return testMethod2(vt);
+    }
+
+    @DontCompile
+    public void test2_verifier(boolean warmup) {
+        MyValue1 vt = MyValue1.createWithFieldsInline(rI, rL);
+        long result = test2(vt);
+        Asserts.assertEQ(result, vt.hash());
+    }
+
+    static value class MyValueWithNative {
+        public final int x;
+
+        private MyValueWithNative(int x) {
+            this.x = x;
+        }
+
+        public native int testMethod3();
+    }
+
+    // Call a native method with a value type receiver
+    @Test
+    @Warmup(10000) // Make sure native method is compiled
+    public int test3(MyValueWithNative vt) {
+        return vt.testMethod3();
+    }
+
+    @DontCompile
+    public void test3_verifier(boolean warmup) {
+        MyValueWithNative vt = new MyValueWithNative(rI);
+        int result = test3(vt);
+        Asserts.assertEQ(result, rI);
+    }
+}