archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Marcus Larsson 2016-04-26 15:16:41 +02:00
commit 5884a7924e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/prims/jvmtiImpl.cpp
View file

@ -278,7 +278,7 @@ bool JvmtiBreakpoint::is_valid() {
_bci >= 0; _bci >= 0;
} }
address JvmtiBreakpoint::getBcp() { address JvmtiBreakpoint::getBcp() const {
return _method->bcp_from(_bci); return _method->bcp_from(_bci);
} }
@ -323,7 +323,7 @@ void JvmtiBreakpoint::clear() {
each_method_version_do(&Method::clear_breakpoint); each_method_version_do(&Method::clear_breakpoint);
} }
void JvmtiBreakpoint::print(outputStream* out) { void JvmtiBreakpoint::print_on(outputStream* out) const {
#ifndef PRODUCT #ifndef PRODUCT
ResourceMark rm; ResourceMark rm;
const char *class_name = (_method == NULL) ? "NULL" : _method->klass_name()->as_C_string(); const char *class_name = (_method == NULL) ? "NULL" : _method->klass_name()->as_C_string();
@ -400,7 +400,7 @@ void JvmtiBreakpoints::print() {
for (int i=0; i<n; i++) { for (int i=0; i<n; i++) {
JvmtiBreakpoint& bp = _bps.at(i); JvmtiBreakpoint& bp = _bps.at(i);
log_stream.print("%d: ", i); log_stream.print("%d: ", i);
bp.print(&log_stream); bp.print_on(&log_stream);
log_stream.cr(); log_stream.cr();
} }
#endif #endif

4
hotspot/src/share/vm/prims/jvmtiImpl.hpp
View file

@ -183,11 +183,11 @@ public:
bool lessThan(JvmtiBreakpoint &bp); bool lessThan(JvmtiBreakpoint &bp);
void copy(JvmtiBreakpoint& bp); void copy(JvmtiBreakpoint& bp);
bool is_valid(); bool is_valid();
address getBcp(); address getBcp() const;
void each_method_version_do(method_action meth_act); void each_method_version_do(method_action meth_act);
void set(); void set();
void clear(); void clear();
void print(outputStream* out); void print_on(outputStream* out) const;
Method* method() { return _method; } Method* method() { return _method; }