--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp	Mon Apr 25 12:11:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp	Tue Apr 26 10:58:03 2016 +0200
@@ -278,7 +278,7 @@
          _bci >= 0;
 }
 
-address JvmtiBreakpoint::getBcp() {
+address JvmtiBreakpoint::getBcp() const {
   return _method->bcp_from(_bci);
 }
 
@@ -323,7 +323,7 @@
   each_method_version_do(&Method::clear_breakpoint);
 }
 
-void JvmtiBreakpoint::print(outputStream* out) {
+void JvmtiBreakpoint::print_on(outputStream* out) const {
 #ifndef PRODUCT
   ResourceMark rm;
   const char *class_name  = (_method == NULL) ? "NULL" : _method->klass_name()->as_C_string();
@@ -400,7 +400,7 @@
   for (int i=0; i<n; i++) {
     JvmtiBreakpoint& bp = _bps.at(i);
     log_stream.print("%d: ", i);
-    bp.print(&log_stream);
+    bp.print_on(&log_stream);
     log_stream.cr();
   }
 #endif

--- a/hotspot/src/share/vm/prims/jvmtiImpl.hpp	Mon Apr 25 12:11:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.hpp	Tue Apr 26 10:58:03 2016 +0200
@@ -183,11 +183,11 @@
   bool lessThan(JvmtiBreakpoint &bp);
   void copy(JvmtiBreakpoint& bp);
   bool is_valid();
-  address getBcp();
+  address getBcp() const;
   void each_method_version_do(method_action meth_act);
   void set();
   void clear();
-  void print(outputStream* out);
+  void print_on(outputStream* out) const;
 
   Method* method() { return _method; }