8185133: Reference pending list root might not get marked
Summary: Ensure that pending list head is marked by initial mark
Reviewed-by: eosterlund, kbarrett, tschatzl
diff --git a/src/share/vm/gc/g1/g1CollectedHeap.cpp b/src/share/vm/gc/g1/g1CollectedHeap.cpp
index fce91a8..c044e9a 100644
--- a/src/share/vm/gc/g1/g1CollectedHeap.cpp
+++ b/src/share/vm/gc/g1/g1CollectedHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -4389,6 +4389,15 @@
rp->verify_no_references_recorded();
assert(!rp->discovery_enabled(), "should have been disabled");
+ // If during an initial mark pause we install a pending list head which is not otherwise reachable
+ // ensure that it is marked in the bitmap for concurrent marking to discover.
+ if (collector_state()->during_initial_mark_pause()) {
+ oop pll_head = Universe::reference_pending_list();
+ if (pll_head != NULL) {
+ _cm->grayRoot(pll_head);
+ }
+ }
+
// FIXME
// CM's reference processing also cleans up the string and symbol tables.
// Should we do that here also? We could, but it is a serial operation
diff --git a/src/share/vm/memory/universe.cpp b/src/share/vm/memory/universe.cpp
index d56e8dd..2d9dded 100644
--- a/src/share/vm/memory/universe.cpp
+++ b/src/share/vm/memory/universe.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -497,7 +497,11 @@
#define assert_pll_ownership() assert_pll_locked(owned_by_self)
oop Universe::reference_pending_list() {
- assert_pll_ownership();
+ if (Thread::current()->is_VM_thread()) {
+ assert_pll_locked(is_locked);
+ } else {
+ assert_pll_ownership();
+ }
return _reference_pending_list;
}
