--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java	Mon Dec 10 15:47:44 2018 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ *
+ * 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 TestC1ArrayCopyNPE
+ * @summary test C1 arraycopy intrinsic
+ * @key gc
+ * @requires vm.gc.Shenandoah
+ * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1ArrayCopyNPE
+ */
+
+public class TestC1ArrayCopyNPE {
+
+    private static final int NUM_RUNS = 10000;
+    private static final int ARRAY_SIZE = 10000;
+    private static int[] a;
+    private static int[] b;
+
+    public static void main(String[] args) {
+        a = null;
+        b = new int[ARRAY_SIZE];
+        for (int i = 0; i < NUM_RUNS; i++) {
+            test();
+        }
+        a = new int[ARRAY_SIZE];
+        b = null;
+        for (int i = 0; i < NUM_RUNS; i++) {
+            test();
+        }
+    }
+
+    private static void test() {
+        try {
+            System.arraycopy(a, 0, b, 0, ARRAY_SIZE);
+            throw new RuntimeException("test failed");
+        } catch (NullPointerException ex) {
+            // Ok
+        }
+    }
+}