--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/jdi/BreakpointTest.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2001, 2017, 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.
+ */
+
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
+/**
+ * @test
+ * @bug 6496524
+ * @key intermittent
+ * @summary Setting breakpoint in jdb crashes Hotspot JVM
+ * @author jjh
+ *
+ * @run build TestScaffold VMConnection TargetListener TargetAdapter
+ * @run compile -g BreakpointTest.java
+ * @run driver BreakpointTest
+ */
+
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import com.sun.jdi.request.*;
+
+import java.util.*;
+
+// The debuggee just runs in a loop. The debugger
+// sets a bkpt on the Math.random call.  When the
+// bkpt is hit, the debugger disables it, resumes
+// the debuggee, waits a bit, and enables the bkpt again.
+
+class BreakpointTarg {
+    public final static int BKPT_LINE = 56;
+
+    public static long count;
+    static void doit() {
+        Object[] roots = new Object[200000];
+        while (true) {
+            int index = (int) (Math.random() * roots.length); // BKPT_LINE
+            // This println makes the test pass
+            //System.out.println("Debuggee: index = " + index);
+            roots[index] = new Object();   // bkpt here passes
+                                           // and null instead of new Object()
+                                           // passes
+            count++;
+        }
+    }
+
+    public static void main(String[] args) {
+        doit();
+    }
+}
+
+    /********** test program **********/
+
+public class BreakpointTest extends TestScaffold {
+    ClassType targetClass;
+    ThreadReference mainThread;
+
+    BreakpointTest (String args[]) {
+        super(args);
+    }
+
+    public static void main(String[] args)      throws Exception {
+        new BreakpointTest(args).startTests();
+    }
+
+    /********** event handlers **********/
+
+    static int maxBkpts = 50;
+    int bkptCount;
+    BreakpointRequest bkptRequest;
+    Field debuggeeCountField;
+
+    // When we get a bkpt we want to disable the request,
+    // resume the debuggee, and then re-enable the request
+    public void breakpointReached(BreakpointEvent event) {
+        System.out.println("Got BreakpointEvent: " + bkptCount +
+                           ", debuggeeCount = " +
+                           ((LongValue)targetClass.
+                            getValue(debuggeeCountField)).value()
+                           );
+        bkptRequest.disable();
+    }
+
+    public void eventSetComplete(EventSet set) {
+        set.resume();
+
+        // The main thread watchs the bkptCount to
+        // see if bkpts stop coming in.  The
+        // test _should_ fail well before maxBkpts bkpts.
+        if (bkptCount++ < maxBkpts) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ee) {
+            }
+            bkptRequest.enable();
+        }
+    }
+
+    public void vmDisconnected(VMDisconnectEvent event) {
+        println("Got VMDisconnectEvent");
+    }
+
+    /********** test core **********/
+
+    protected void runTests() throws Exception {
+        /*
+         * Get to the top of main()
+         * to determine targetClass and mainThread
+         */
+        BreakpointEvent bpe = startToMain("BreakpointTarg");
+        targetClass = (ClassType)bpe.location().declaringType();
+        mainThread = bpe.thread();
+        EventRequestManager erm = vm().eventRequestManager();
+
+        Location loc1 = findLocation(
+                            targetClass,
+                            BreakpointTarg.BKPT_LINE);
+
+        bkptRequest = erm.createBreakpointRequest(loc1);
+        bkptRequest.enable();
+        debuggeeCountField = targetClass.fieldByName("count");
+        try {
+
+            addListener (this);
+        } catch (Exception ex){
+            ex.printStackTrace();
+            failure("failure: Could not add listener");
+            throw new Exception("BreakpointTest: failed");
+        }
+
+        int prevBkptCount;
+        vm().resume();
+        while (!vmDisconnected && bkptCount < maxBkpts) {
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException ee) {
+            }
+        }
+
+        println("done with loop, final count = " +
+                    ((LongValue)targetClass.
+                     getValue(debuggeeCountField)).value());
+        bkptRequest.disable();
+        removeListener(this);
+
+
+        /*
+         * deal with results of test
+         * if anything has called failure("foo") testFailed will be true
+         */
+        if (!testFailed) {
+            println("BreakpointTest: passed");
+        } else {
+            throw new Exception("BreakpointTest: failed");
+        }
+    }
+}