OpenJDK / amber / amber
changeset 53945:449a2ce77784
8215034: Remove old HOTSWAP conditionals
Reviewed-by: dcubed, jiangli, sspitsyn
author | coleenp |
---|---|
date | Fri, 07 Dec 2018 17:20:44 -0500 |
parents | 7cc17c043ce0 |
children | 06d028f7578e |
files | src/hotspot/share/code/codeCache.cpp src/hotspot/share/code/codeCache.hpp src/hotspot/share/interpreter/templateInterpreter.hpp src/hotspot/share/utilities/globalDefinitions.hpp |
diffstat | 4 files changed, 3 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/code/codeCache.cpp Fri Dec 07 14:48:35 2018 -0500 +++ b/src/hotspot/share/code/codeCache.cpp Fri Dec 07 17:20:44 2018 -0500 @@ -1200,7 +1200,6 @@ #endif } -#ifdef HOTSWAP int CodeCache::mark_for_evol_deoptimization(InstanceKlass* dependee) { MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag); int number_of_marked_CodeBlobs = 0; @@ -1234,8 +1233,6 @@ return number_of_marked_CodeBlobs; } -#endif // HOTSWAP - // Deoptimize all methods void CodeCache::mark_all_nmethods_for_deoptimization() { @@ -1297,8 +1294,8 @@ } } -#ifdef HOTSWAP -// Flushes compiled methods dependent on dependee in the evolutionary sense +// Flushes compiled methods dependent on dependee when the dependee is redefined +// via RedefineClasses void CodeCache::flush_evol_dependents_on(InstanceKlass* ev_k) { // --- Compile_lock is not held. However we are at a safepoint. assert_locked_or_safepoint(Compile_lock); @@ -1326,8 +1323,6 @@ make_marked_nmethods_not_entrant(); } } -#endif // HOTSWAP - // Flushes compiled methods dependent on dependee void CodeCache::flush_dependents_on_method(const methodHandle& m_h) {
--- a/src/hotspot/share/code/codeCache.hpp Fri Dec 07 14:48:35 2018 -0500 +++ b/src/hotspot/share/code/codeCache.hpp Fri Dec 07 17:20:44 2018 -0500 @@ -286,9 +286,7 @@ // Deoptimization private: static int mark_for_deoptimization(KlassDepChange& changes); -#ifdef HOTSWAP static int mark_for_evol_deoptimization(InstanceKlass* dependee); -#endif // HOTSWAP public: static void mark_all_nmethods_for_deoptimization(); @@ -297,10 +295,8 @@ // Flushing and deoptimization static void flush_dependents_on(InstanceKlass* dependee); -#ifdef HOTSWAP // Flushing and deoptimization in case of evolution static void flush_evol_dependents_on(InstanceKlass* dependee); -#endif // HOTSWAP // Support for fullspeed debugging static void flush_dependents_on_method(const methodHandle& dependee);
--- a/src/hotspot/share/interpreter/templateInterpreter.hpp Fri Dec 07 14:48:35 2018 -0500 +++ b/src/hotspot/share/interpreter/templateInterpreter.hpp Fri Dec 07 17:20:44 2018 -0500 @@ -111,9 +111,7 @@ static address _throw_StackOverflowError_entry; static address _remove_activation_entry; // continuation address if an exception is not handled by current frame -#ifdef HOTSWAP static address _remove_activation_preserving_args_entry; // continuation address when current frame is being popped -#endif // HOTSWAP #ifndef PRODUCT static EntryPoint _trace_code; @@ -146,9 +144,7 @@ public: static address remove_activation_early_entry(TosState state) { return _earlyret_entry.entry(state); } -#ifdef HOTSWAP - static address remove_activation_preserving_args_entry() { return _remove_activation_preserving_args_entry; } -#endif // HOTSWAP + static address remove_activation_preserving_args_entry() { return _remove_activation_preserving_args_entry; } static address remove_activation_entry() { return _remove_activation_entry; } static address throw_exception_entry() { return _throw_exception_entry; }
--- a/src/hotspot/share/utilities/globalDefinitions.hpp Fri Dec 07 14:48:35 2018 -0500 +++ b/src/hotspot/share/utilities/globalDefinitions.hpp Fri Dec 07 17:20:44 2018 -0500 @@ -422,14 +422,6 @@ const size_t defaultSymbolTableSize = 32768; // 2^15 const size_t minimumSymbolTableSize = 1024; - -//---------------------------------------------------------------------------------------------------- -// HotSwap - for JVMTI aka Class File Replacement and PopFrame -// -// Determines whether on-the-fly class replacement and frame popping are enabled. - -#define HOTSWAP - //---------------------------------------------------------------------------------------------------- // Object alignment, in units of HeapWords. //