--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Thu Nov 14 17:34:45 2019 -0800
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Fri Nov 15 16:58:29 2019 -0500
@@ -2001,7 +2001,6 @@
 
 bool G1CollectedHeap::should_do_concurrent_full_gc(GCCause::Cause cause) {
   switch (cause) {
-    case GCCause::_gc_locker:               return GCLockerInvokesConcurrent;
     case GCCause::_g1_humongous_allocation: return true;
     case GCCause::_g1_periodic_collection:  return G1PeriodicGCInvokesConcurrent;
     default:                                return is_user_requested_concurrent_full_gc(cause);
@@ -2281,8 +2280,7 @@
   } else if (GCLocker::should_discard(cause, gc_count_before)) {
     // Indicate failure to be consistent with VMOp failure due to
     // another collection slipping in after our gc_count but before
-    // our request is processed.  _gc_locker collections upgraded by
-    // GCLockerInvokesConcurrent are handled above and never discarded.
+    // our request is processed.
     return false;
   } else if (cause == GCCause::_gc_locker || cause == GCCause::_wb_young_gc
              DEBUG_ONLY(|| cause == GCCause::_scavenge_alot)) {

--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Thu Nov 14 17:34:45 2019 -0800
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Fri Nov 15 16:58:29 2019 -0500
@@ -262,12 +262,11 @@
 
   // Return true if an explicit GC should start a concurrent cycle instead
   // of doing a STW full GC. A concurrent cycle should be started if:
-  // (a) cause == _gc_locker and +GCLockerInvokesConcurrent,
-  // (b) cause == _g1_humongous_allocation,
-  // (c) cause == _java_lang_system_gc and +ExplicitGCInvokesConcurrent,
-  // (d) cause == _dcmd_gc_run and +ExplicitGCInvokesConcurrent,
-  // (e) cause == _wb_conc_mark,
-  // (f) cause == _g1_periodic_collection and +G1PeriodicGCInvokesConcurrent.
+  // (a) cause == _g1_humongous_allocation,
+  // (b) cause == _java_lang_system_gc and +ExplicitGCInvokesConcurrent,
+  // (c) cause == _dcmd_gc_run and +ExplicitGCInvokesConcurrent,
+  // (d) cause == _wb_conc_mark,
+  // (e) cause == _g1_periodic_collection and +G1PeriodicGCInvokesConcurrent.
   bool should_do_concurrent_full_gc(GCCause::Cause cause);
 
   // Attempt to start a concurrent cycle with the indicated cause.

--- a/src/hotspot/share/gc/shared/gc_globals.hpp	Thu Nov 14 17:34:45 2019 -0800
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp	Fri Nov 15 16:58:29 2019 -0500
@@ -228,10 +228,6 @@
           "A System.gc() request invokes a concurrent collection; "         \
           "(effective only when using concurrent collectors)")              \
                                                                             \
-  product(bool, GCLockerInvokesConcurrent, false,                           \
-          "The exit of a JNI critical section necessitating a scavenge, "   \
-          "also kicks off a background concurrent collection")              \
-                                                                            \
   product(uintx, GCLockerEdenExpansionPercent, 5,                           \
           "How much the GC can expand the eden by while the GC locker "     \
           "is active (as a percentage)")                                    \

--- a/src/hotspot/share/runtime/arguments.cpp	Thu Nov 14 17:34:45 2019 -0800
+++ b/src/hotspot/share/runtime/arguments.cpp	Fri Nov 15 16:58:29 2019 -0500
@@ -619,6 +619,7 @@
   { "ResizeOldPLAB",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "UseCMSBestFit",                           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "UseCMSInitiatingOccupancyOnly",           JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
+  { "GCLockerInvokesConcurrent",     JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "BindGCTaskThreadsToCPUs",       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
   { "UseGCTaskAffinity",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },