--- /dev/null	2017-01-22 10:16:57.869617664 -0800
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java	2017-02-15 16:59:24.703729221 -0800
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2011, 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 org.junit.Test;
+
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+
+import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+public class ExplicitExceptionTest extends GraalCompilerTest {
+
+    private int expectedForeignCallCount;
+
+    @Override
+    protected InstalledCode getCode(ResolvedJavaMethod method) {
+        InstalledCode installedCode = super.getCode(method);
+        assertDeepEquals(expectedForeignCallCount, lastCompiledGraph.getNodes().filter(ForeignCallNode.class).count());
+        return installedCode;
+    }
+
+    public static int testAIOOBESnippet(int[] array) {
+        return array[10];
+    }
+
+    @Test
+    public void testAIOOBE() {
+        int[] array = new int[4];
+        for (int i = 0; i < 10000; i++) {
+            try {
+                testAIOOBESnippet(array);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                // nothing to do
+            }
+        }
+        expectedForeignCallCount = 2;
+        test("testAIOOBESnippet", array);
+    }
+
+    public static int testNPEArraySnippet(int[] array) {
+        return array[10];
+    }
+
+    @Test
+    public void testNPEArray() {
+        int[] array = null;
+        for (int i = 0; i < 10000; i++) {
+            try {
+                testNPEArraySnippet(array);
+            } catch (NullPointerException e) {
+                // nothing to do
+            }
+        }
+        expectedForeignCallCount = 2;
+        test("testNPEArraySnippet", array);
+    }
+
+    private static class TestClass {
+        int field;
+    }
+
+    public static int testNPESnippet(TestClass obj) {
+        return obj.field;
+    }
+
+    @SuppressWarnings("unused")
+    @Test
+    public void testNPE() {
+        new TestClass();
+        TestClass obj = null;
+        for (int i = 0; i < 10000; i++) {
+            try {
+                testNPESnippet(obj);
+            } catch (NullPointerException e) {
+                // nothing to do
+            }
+        }
+        expectedForeignCallCount = 1;
+        test("testNPESnippet", obj);
+    }
+
+}