--- /dev/null	2015-11-09 17:15:02.000000000 -0800
+++ new/jdk/test/java/lang/StackWalker/CallerFromMain.java	2015-11-09 17:15:02.000000000 -0800
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015, 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 8140450
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
+ * @summary Test if the getCallerClass method returns empty optional
+ * @run main CallerFromMain exec
+ */
+
+import java.util.Optional;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.OutputAnalyzer;
+
+public class CallerFromMain {
+
+    public static void getCaller(Class<?> caller) {
+        // StackWalker::getCallerClass
+        // CallerFromMain::doIt
+        // caller
+        Optional<Class<?>> c = sw.getCallerClass();
+        if (caller != null && c.get() != caller) {
+            throw new RuntimeException("Expected " + caller + " but got " + c);
+        }
+        if (caller == null && c.isPresent()) {
+            throw new RuntimeException("Expected empty optional: " + c);
+        }
+    }
+
+    private static final StackWalker sw = StackWalker.create(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0) {
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "CallerFromMain");
+            OutputAnalyzer output = ProcessTools.executeProcess(pb);
+            System.out.println(output.getOutput());
+            output.shouldHaveExitValue(0);
+            return;
+        }
+
+        // StackWalker::getCallerClass
+        // CallerFromMain::main
+        // no caller
+        Optional<Class<?>> c = sw.getCallerClass();
+        System.out.println("Call from main: " + c);
+        if (c.isPresent()) {
+            throw new RuntimeException("Expected empty optional: " + c);
+        }
+
+        // call from Thread::run
+        Thread t1 = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Optional<Class<?>> c = sw.getCallerClass();
+                System.out.println("Call from Thread.run: " + c);
+
+                if (c.get() != Thread.class) {
+                    throw new RuntimeException("Expected Thread.class but got " + c);
+                }
+            }
+        });
+
+        t1.setDaemon(true);
+        t1.start();
+
+        // call from MyThread::run
+        Thread t2 = new MyThread(new Runnable() {
+            @Override
+            public void run() {
+                Optional<Class<?>> c = sw.getCallerClass();
+                System.out.println("Call from MyThread.run: " + c);
+
+                if (c.get() != MyThread.class) {
+                    throw new RuntimeException("Expected MyThread.class but got " + c);
+                }
+            }
+        });
+        t2.setDaemon(true);
+        t2.start();
+
+        t1.join();
+        t2.join();
+    }
+
+    static class MyThread extends Thread {
+        final Runnable runnable;
+        MyThread(Runnable runnable) {
+            super("MyThread");
+            this.runnable = runnable;
+        }
+        public void run() {
+            runnable.run();
+        }
+    }
+}
+