Tue, 10 Sep 2013 15:28:44 -0700
Merge
1.1 --- a/src/share/vm/runtime/interfaceSupport.hpp Tue Sep 10 14:51:48 2013 -0700 1.2 +++ b/src/share/vm/runtime/interfaceSupport.hpp Tue Sep 10 15:28:44 2013 -0700 1.3 @@ -471,16 +471,6 @@ 1.4 VM_ENTRY_BASE(result_type, header, thread) \ 1.5 debug_only(VMEntryWrapper __vew;) 1.6 1.7 -// Another special case for nmethod_entry_point so the nmethod that the 1.8 -// interpreter is about to branch to doesn't get flushed before as we 1.9 -// branch to it's interpreter_entry_point. Skip stress testing here too. 1.10 -// Also we don't allow async exceptions because it is just too painful. 1.11 -#define IRT_ENTRY_FOR_NMETHOD(result_type, header) \ 1.12 - result_type header { \ 1.13 - nmethodLocker _nmlock(nm); \ 1.14 - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ 1.15 - VM_ENTRY_BASE(result_type, header, thread) 1.16 - 1.17 #define IRT_END } 1.18 1.19