--- a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java	Wed Jun 04 16:52:50 2014 +0200
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java	Wed Jun 04 20:43:37 2014 +0200
@@ -273,7 +273,7 @@
      *
      * @param sourceType the source type
      * @param targetType the target type
-     * @return true if lossess conversion is possible
+     * @return true if lossless conversion is possible
      */
     public static boolean isConvertibleWithoutLoss(final Class<?> sourceType, final Class<?> targetType) {
         if(targetType.isAssignableFrom(sourceType)) {
@@ -290,14 +290,8 @@
             assert WRAPPER_TYPES.get(sourceType) != null : sourceType.getName();
             return targetType.isAssignableFrom(WRAPPER_TYPES.get(sourceType));
         }
-        if(targetType.isPrimitive()) {
-            if(targetType == void.class) {
-                return false; // Void can't represent anything losslessly
-            }
-            final Class<?> unboxedCallSiteType = PRIMITIVE_TYPES.get(sourceType);
-            return unboxedCallSiteType != null
-                    && (unboxedCallSiteType == targetType || isProperPrimitiveLosslessSubtype(unboxedCallSiteType, targetType));
-        }
+        // Can't convert from any non-primitive type to any primitive type without data loss because of null.
+        // Also, can't convert non-assignable reference types.
         return false;
     }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8038413.js	Wed Jun 04 20:43:37 2014 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2013, 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.
+ */
+
+/**
+ * JDK-8038413: NPE in unboxInteger
+ *
+ * @test
+ * @run
+ */
+
+// When adapting a method returning Integer to an optimistic call site
+// expecting int, can't forego filters because of null. That is, the
+// Integer->int conversion can't be left to the automatisms present in
+// java.lang.invoke.MethodHandle.asType() because of potential null 
+// values.
+var IntegerArray = Java.type("java.lang.Integer[]");
+var arr = new IntegerArray(1);
+print(arr[0]);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8038413.js.EXPECTED	Wed Jun 04 20:43:37 2014 +0200
@@ -0,0 +1,1 @@
+null