diff options
author | kvn <none@none> | 2013-11-05 17:38:04 -0800 |
---|---|---|
committer | kvn <none@none> | 2013-11-05 17:38:04 -0800 |
commit | 448e4a8ada27f95b604d56572b7e061c157e9d8c (patch) | |
tree | e778fc8f1c06b8cb3026363cdadc62db28edb0ca /src/share/vm/runtime/interfaceSupport.hpp | |
parent | 2d51488e378df0299af1d7b786a931129899c81a (diff) | |
parent | 9d58089aaab0379ed221bae24a808871374f626b (diff) | |
download | jdk8u_hotspot-448e4a8ada27f95b604d56572b7e061c157e9d8c.tar.gz |
Merge
Diffstat (limited to 'src/share/vm/runtime/interfaceSupport.hpp')
-rw-r--r-- | src/share/vm/runtime/interfaceSupport.hpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/share/vm/runtime/interfaceSupport.hpp b/src/share/vm/runtime/interfaceSupport.hpp index 383f83359..fa9ad5e51 100644 --- a/src/share/vm/runtime/interfaceSupport.hpp +++ b/src/share/vm/runtime/interfaceSupport.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -56,7 +56,7 @@ class HandleMarkCleaner: public StackObj { } private: - inline void* operator new(size_t size, void* ptr) { + inline void* operator new(size_t size, void* ptr) throw() { return ptr; } }; @@ -474,16 +474,6 @@ class RuntimeHistogramElement : public HistogramElement { 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 } |