--- old/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java	2018-10-11 19:51:28.000000000 -0700
+++ new/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java	2018-10-11 19:51:27.000000000 -0700
@@ -100,6 +100,12 @@
     public void breakpointEvent(BreakpointEvent be)  {
         Thread.yield();  // fetch output
         MessageOutput.lnprint("Breakpoint hit:");
+        // Print current location and prompt if suspend policy is SUSPEND_EVENT_THREAD.
+        // In case of SUSPEND_ALL policy this is handled by vmInterrupted() method.
+        if (be.request().suspendPolicy() == EventRequest.SUSPEND_EVENT_THREAD) {
+            printCurrentLocation(ThreadInfo.getThreadInfo(be.thread()));
+            MessageOutput.printPrompt();
+        }
     }
 
     @Override
@@ -227,8 +233,7 @@
                                              Commands.locationString(loc)});
     }
 
-    private void printCurrentLocation() {
-        ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo();
+    private void printCurrentLocation(ThreadInfo threadInfo) {
         StackFrame frame;
         try {
             frame = threadInfo.getCurrentFrame();
@@ -259,6 +264,10 @@
         MessageOutput.println();
     }
 
+    private void printCurrentLocation() {
+        printCurrentLocation(ThreadInfo.getCurrentThreadInfo());
+    }
+
     private void printLocationOfEvent(LocatableEvent theEvent) {
         printBaseLocation(theEvent.thread().name(), theEvent.location());
     }
--- old/test/jdk/com/sun/jdi/lib/jdb/Jdb.java	2018-10-11 19:51:29.000000000 -0700
+++ new/test/jdk/com/sun/jdi/lib/jdb/Jdb.java	2018-10-11 19:51:29.000000000 -0700
@@ -207,6 +207,10 @@
     }
 
     public List<String> command(JdbCommand cmd) {
+        return command(cmd, false);
+    }
+
+    public List<String> command(JdbCommand cmd, boolean waitForSimplePrompt) {
         if (!jdb.isAlive()) {
             if (cmd.allowExit) {
                 // return remaining output
@@ -223,7 +227,7 @@
             throw new RuntimeException("Unexpected IO error while writing command '" + cmd.cmd + "' to jdb stdin stream");
         }
 
-        return waitForPrompt(1, cmd.allowExit);
+        return waitForSimplePrompt ? waitForSimplePrompt(1, cmd.allowExit) : waitForPrompt(1, cmd.allowExit);
     }
 
     public List<String> command(String cmd) {
--- old/test/jdk/com/sun/jdi/lib/jdb/JdbCommand.java	2018-10-11 19:51:31.000000000 -0700
+++ new/test/jdk/com/sun/jdi/lib/jdb/JdbCommand.java	2018-10-11 19:51:30.000000000 -0700
@@ -145,6 +145,9 @@
     public static JdbCommand stopAt(String targetClass, int lineNum) {
         return new JdbCommand("stop at " + targetClass + ":" + lineNum);
     }
+    public static JdbCommand stopThreadAt(String targetClass, int lineNum) {
+        return new JdbCommand("stop thread at " + targetClass + ":" + lineNum);
+    }
     public static JdbCommand stopIn(String targetClass, String methodName) {
         return new JdbCommand("stop in " + targetClass + "." + methodName);
     }
--- /dev/null	2018-10-11 19:51:32.000000000 -0700
+++ new/test/jdk/com/sun/jdi/JdbStopThreadTest.java	2018-10-11 19:51:32.000000000 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, 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 8211736
+ * @summary Tests that the current location and prompt are printed in the debugger output
+ * when breakpoint is hit and suspend policy is set to SUSPEND_EVENT_THREAD
+ *
+ * @library /test/lib
+ * @run compile -g JdbStopThreadTest.java
+ * @run main/othervm JdbStopThreadTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+        import lib.jdb.JdbCommand;
+        import lib.jdb.JdbTest;
+
+class JdbStopThreadTestTarg {
+    public static void main(String[] args) {
+        test();
+    }
+
+    private static void test() {
+        Thread thread = Thread.currentThread();
+        print(thread); // @1 breakpoint
+    }
+
+    public static void print(Object obj) {
+        System.out.println(obj);
+    }
+}
+
+public class JdbStopThreadTest extends JdbTest {
+    public static void main(String argv[]) {
+        new JdbStopThreadTest().run();
+    }
+
+    private JdbStopThreadTest() {
+        super(DEBUGGEE_CLASS);
+    }
+
+    private static final String DEBUGGEE_CLASS = JdbStopThreadTestTarg.class.getName();
+    private static final String NEW_LINE = System.getProperty("line.separator");
+    private static final String PATTERN_TEMPLATE = "^Breakpoint hit: \"thread=main\", " +
+            "JdbStopThreadTestTarg\\.test\\(\\), line=%LINE_NUMBER.*" + NEW_LINE +
+            "%LINE_NUMBER\\s+print\\(thread\\);.*" + NEW_LINE + NEW_LINE + ">\\s";
+
+    @Override
+    protected void runCases() {
+        int bpLine = parseBreakpoints(getTestSourcePath("JdbStopThreadTest.java"), 1).get(0);
+        jdb.command(JdbCommand.stopThreadAt(DEBUGGEE_CLASS ,bpLine));
+        // Run to breakpoint #1
+        jdb.command(JdbCommand.run(), true);
+        String jdbOutput = jdb.getJdbOutput();
+        jdb.quit();
+        String pattern = PATTERN_TEMPLATE.replaceAll("%LINE_NUMBER", String.valueOf(bpLine));
+        new OutputAnalyzer(jdbOutput).shouldMatch(pattern);
+    }
+}