Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiExport.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | a6eef545f1a2 |
| children | 4ceaf61479fc |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiExport.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/prims/jvmtiExport.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -373,7 +373,7 @@ JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); // transition code: native to VM ThreadInVMfromNative __tiv(current_thread); - __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) + VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) debug_only(VMNativeEntryWrapper __vew;) JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);