archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Christian Thalinger 2016-01-11 17:11:57 -08:00
commit a0861106e3
1535 changed files with 3601 additions and 18634 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/code/nmethod.cpp
View file

@ -41,6 +41,7 @@
#include "prims/jvmtiImpl.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/sweeper.hpp"
#include "utilities/resourceHash.hpp"
@ -3096,6 +3097,17 @@ const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
CodeBlob* cb = CodeCache::find_blob(dest);
if (cb != NULL) {
st.print(" %s", cb->name());
} else {
ResourceMark rm;
const int buflen = 1024;
char* buf = NEW_RESOURCE_ARRAY(char, buflen);
int offset;
if (os::dll_address_to_function_name(dest, buf, buflen, &offset)) {
st.print(" %s", buf);
if (offset != 0) {
st.print("+%d", offset);
}
}
}
return st.as_string();
}