Merge
authorvlivanov
Tue, 10 Sep 2013 15:28:44 -0700
changeset 19771 1f38fb6a1268
parent 19770 7cb9f982ea81 (current diff)
parent 19769 edc48ee8130a (diff)
child 19772 6e60ae28d9f6
Merge
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Sep 10 14:51:48 2013 -0700
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Sep 10 15:28:44 2013 -0700
@@ -471,16 +471,6 @@
     VM_ENTRY_BASE(result_type, header, thread)                       \
     debug_only(VMEntryWrapper __vew;)
 
-// Another special case for nmethod_entry_point so the nmethod that the
-// interpreter is about to branch to doesn't get flushed before as we
-// branch to it's interpreter_entry_point.  Skip stress testing here too.
-// Also we don't allow async exceptions because it is just too painful.
-#define IRT_ENTRY_FOR_NMETHOD(result_type, header)                   \
-  result_type header {                                               \
-    nmethodLocker _nmlock(nm);                                       \
-    ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
-    VM_ENTRY_BASE(result_type, header, thread)
-
 #define IRT_END }