1.1 --- a/src/share/vm/runtime/interfaceSupport.hpp Wed Oct 16 10:52:41 2013 +0200 1.2 +++ b/src/share/vm/runtime/interfaceSupport.hpp Tue Nov 05 17:38:04 2013 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -56,7 +56,7 @@ 1.11 } 1.12 1.13 private: 1.14 - inline void* operator new(size_t size, void* ptr) { 1.15 + inline void* operator new(size_t size, void* ptr) throw() { 1.16 return ptr; 1.17 } 1.18 }; 1.19 @@ -474,16 +474,6 @@ 1.20 VM_ENTRY_BASE(result_type, header, thread) \ 1.21 debug_only(VMEntryWrapper __vew;) 1.22 1.23 -// Another special case for nmethod_entry_point so the nmethod that the 1.24 -// interpreter is about to branch to doesn't get flushed before as we 1.25 -// branch to it's interpreter_entry_point. Skip stress testing here too. 1.26 -// Also we don't allow async exceptions because it is just too painful. 1.27 -#define IRT_ENTRY_FOR_NMETHOD(result_type, header) \ 1.28 - result_type header { \ 1.29 - nmethodLocker _nmlock(nm); \ 1.30 - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ 1.31 - VM_ENTRY_BASE(result_type, header, thread) 1.32 - 1.33 #define IRT_END } 1.34 1.35