archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8222086: CodeCache::UnloadingScope needs to preserve and restore previous IsUnloadingBehavior

Browse source 
Reviewed-by: eosterlund
This commit is contained in:
Zhengyu Gu 2019-04-08 13:22:59 -04:00
parent 8dfa6d1acc
commit cc871f0459
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hotspot/share/code/codeCache.cpp
View file

@ -780,13 +780,14 @@ void CodeCache::increment_unloading_cycle() {
CodeCache::UnloadingScope::UnloadingScope(BoolObjectClosure* is_alive) CodeCache::UnloadingScope::UnloadingScope(BoolObjectClosure* is_alive)
: _is_unloading_behaviour(is_alive) : _is_unloading_behaviour(is_alive)
{ {
_saved_behaviour = IsUnloadingBehaviour::current();
IsUnloadingBehaviour::set_current(&_is_unloading_behaviour); IsUnloadingBehaviour::set_current(&_is_unloading_behaviour);
increment_unloading_cycle(); increment_unloading_cycle();
DependencyContext::cleaning_start(); DependencyContext::cleaning_start();
} }
CodeCache::UnloadingScope::~UnloadingScope() { CodeCache::UnloadingScope::~UnloadingScope() {
IsUnloadingBehaviour::set_current(NULL); IsUnloadingBehaviour::set_current(_saved_behaviour);
DependencyContext::cleaning_end(); DependencyContext::cleaning_end();
} }

1
src/hotspot/share/code/codeCache.hpp
View file

@ -170,6 +170,7 @@ class CodeCache : AllStatic {
// "unloading_occurred" controls whether metadata should be cleaned because of class unloading. // "unloading_occurred" controls whether metadata should be cleaned because of class unloading.
class UnloadingScope: StackObj { class UnloadingScope: StackObj {
ClosureIsUnloadingBehaviour _is_unloading_behaviour; ClosureIsUnloadingBehaviour _is_unloading_behaviour;
IsUnloadingBehaviour* _saved_behaviour;
public: public:
UnloadingScope(BoolObjectClosure* is_alive); UnloadingScope(BoolObjectClosure* is_alive);