--- a/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java	Thu Jun 02 21:15:12 2016 +0000
+++ b/jdk/src/java.base/share/classes/java/lang/StackFrameInfo.java	Thu Jun 02 16:39:14 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -29,8 +29,6 @@
 
 import static java.lang.StackWalker.Option.*;
 import java.lang.StackWalker.StackFrame;
-import java.util.Optional;
-import java.util.OptionalInt;
 
 class StackFrameInfo implements StackFrame {
     private final static JavaLangInvokeAccess JLIA =
@@ -82,19 +80,21 @@
 
     @Override
     public int getByteCodeIndex() {
+        // bci not available for native methods
+        if (isNativeMethod())
+            return -1;
+
         return bci;
     }
 
     @Override
     public String getFileName() {
-        if (isNativeMethod())
-            return null;
-
         return toStackTraceElement().getFileName();
     }
 
     @Override
     public int getLineNumber() {
+        // line number not available for native methods
         if (isNativeMethod())
             return -2;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/StackWalker/NativeMethod.java	Thu Jun 02 16:39:14 2016 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2016, 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
+ * @bug 8157892 8157977
+ * @summary Verify file name, line number and bci of native methods
+ * @run main NativeMethod
+ */
+
+import java.lang.StackWalker.Option;
+import java.lang.StackWalker.StackFrame;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class NativeMethod {
+    public static void main(String... args) throws Exception {
+        new NativeMethod().test();
+    }
+
+    private final StackWalker walker;
+    NativeMethod() {
+        this.walker = StackWalker.getInstance(Option.SHOW_REFLECT_FRAMES);
+    }
+
+    void test() throws Exception {
+        // invoke via reflection that includes native methods
+        Method m = NativeMethod.class.getDeclaredMethod("walk");
+        m.invoke(this);
+    }
+
+    void walk() {
+        List<StackFrame> nativeFrames = walker.walk(s ->
+            s.filter(StackFrame::isNativeMethod)
+             .collect(Collectors.toList())
+        );
+
+        assertTrue(nativeFrames.size() > 0, "native frame not found");
+        for (StackFrame f : nativeFrames) {
+            assertTrue(f.getFileName() != null, "source file expected to be found");
+            assertTrue(f.getLineNumber() < 0, "line number expected to be unavailable");
+            assertTrue(f.getByteCodeIndex() < 0, "bci expected to be unavailable");
+        }
+
+    }
+
+    private static void assertTrue(boolean value, String msg) {
+        if (value != true)
+            throw new AssertionError(msg);
+    }
+}