提交 427aeb32 编写于 作者: S stefank

8024974: Incorrect use of GC_locker::is_active()

Summary: SymbolTable and StringTable can make calls to GC_locker::is_active() outside a safepoint. This isn't safe because the GC_locker active state (lock count) is only updated at a safepoint and only remains valid as long as _needs_gc is true. However, outside a safepoint_needs_gc can change to false at any time, which makes it impossible to do a correct call to is_active() in that context. In this case these calls can just be removed since the input argument to basic_add() should never be on the heap and so there's no need to check the GC_locker state. This change also adjusts the assert() in is_active() to makes sure all calls to this function are always done under a safepoint.
Reviewed-by: brutisso, dcubed
Contributed-by: per.liden@oracle.com
上级 84626e9a
...@@ -341,7 +341,7 @@ Symbol* SymbolTable::new_permanent_symbol(const char* name, TRAPS) { ...@@ -341,7 +341,7 @@ Symbol* SymbolTable::new_permanent_symbol(const char* name, TRAPS) {
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len,
unsigned int hashValue_arg, bool c_heap, TRAPS) { unsigned int hashValue_arg, bool c_heap, TRAPS) {
assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), assert(!Universe::heap()->is_in_reserved(name),
"proposed name of symbol must be stable"); "proposed name of symbol must be stable");
// Don't allow symbols to be created which cannot fit in a Symbol*. // Don't allow symbols to be created which cannot fit in a Symbol*.
...@@ -685,7 +685,7 @@ oop StringTable::intern(Handle string_or_null, jchar* name, ...@@ -685,7 +685,7 @@ oop StringTable::intern(Handle string_or_null, jchar* name,
if (found_string != NULL) return found_string; if (found_string != NULL) return found_string;
debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); debug_only(StableMemoryChecker smc(name, len * sizeof(name[0])));
assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), assert(!Universe::heap()->is_in_reserved(name),
"proposed name of symbol must be stable"); "proposed name of symbol must be stable");
Handle string; Handle string;
......
...@@ -122,7 +122,7 @@ void GC_locker::jni_unlock(JavaThread* thread) { ...@@ -122,7 +122,7 @@ void GC_locker::jni_unlock(JavaThread* thread) {
// strictly needed. It's added here to make it clear that // strictly needed. It's added here to make it clear that
// the GC will NOT be performed if any other caller // the GC will NOT be performed if any other caller
// of GC_locker::lock() still needs GC locked. // of GC_locker::lock() still needs GC locked.
if (!is_active()) { if (!is_active_internal()) {
_doing_gc = true; _doing_gc = true;
{ {
// Must give up the lock while at a safepoint // Must give up the lock while at a safepoint
......
...@@ -88,7 +88,7 @@ class GC_locker: public AllStatic { ...@@ -88,7 +88,7 @@ class GC_locker: public AllStatic {
public: public:
// Accessors // Accessors
static bool is_active() { static bool is_active() {
assert(_needs_gc || SafepointSynchronize::is_at_safepoint(), "only read at safepoint"); assert(SafepointSynchronize::is_at_safepoint(), "only read at safepoint");
return is_active_internal(); return is_active_internal();
} }
static bool needs_gc() { return _needs_gc; } static bool needs_gc() { return _needs_gc; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册