--- a/src/hotspot/share/gc/cms/cmsHeap.cpp	Mon Sep 09 16:54:48 2019 -0400
+++ b/src/hotspot/share/gc/cms/cmsHeap.cpp	Tue Sep 10 07:42:04 2019 +0200
@@ -240,13 +240,11 @@
 }
 
 void CMSHeap::gc_prologue(bool full) {
-  always_do_update_barrier = false;
   GenCollectedHeap::gc_prologue(full);
 };
 
 void CMSHeap::gc_epilogue(bool full) {
   GenCollectedHeap::gc_epilogue(full);
-  always_do_update_barrier = true;
 };
 
 GrowableArray<GCMemoryManager*> CMSHeap::memory_managers() {

--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Mon Sep 09 16:54:48 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp	Tue Sep 10 07:42:04 2019 +0200
@@ -2517,7 +2517,6 @@
 }
 
 void G1CollectedHeap::gc_prologue(bool full) {
-  // always_do_update_barrier = false;
   assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
 
   // This summary needs to be printed before incrementing total collections.
@@ -2551,7 +2550,6 @@
 #if COMPILER2_OR_JVMCI
   assert(DerivedPointerTable::is_empty(), "derived pointer present");
 #endif
-  // always_do_update_barrier = true;
 
   double start = os::elapsedTime();
   resize_all_tlabs();

--- a/src/hotspot/share/gc/shared/genArguments.cpp	Mon Sep 09 16:54:48 2019 -0400
+++ b/src/hotspot/share/gc/shared/genArguments.cpp	Tue Sep 10 07:42:04 2019 +0200
@@ -196,8 +196,6 @@
     }
   }
 
-  always_do_update_barrier = UseConcMarkSweepGC;
-
   DEBUG_ONLY(assert_flags();)
 }
 

--- a/src/hotspot/share/oops/oop.cpp	Mon Sep 09 16:54:48 2019 -0400
+++ b/src/hotspot/share/oops/oop.cpp	Tue Sep 10 07:42:04 2019 +0200
@@ -37,8 +37,6 @@
 #include "utilities/copy.hpp"
 #include "utilities/macros.hpp"
 
-bool always_do_update_barrier = false;
-
 void oopDesc::print_on(outputStream* st) const {
   klass()->oop_print_on(oop(this), st);
 }

--- a/src/hotspot/share/oops/oop.hpp	Mon Sep 09 16:54:48 2019 -0400
+++ b/src/hotspot/share/oops/oop.hpp	Tue Sep 10 07:42:04 2019 +0200
@@ -40,8 +40,6 @@
 //
 // no virtual functions allowed
 
-extern bool always_do_update_barrier;
-
 // Forward declarations.
 class OopClosure;
 class ScanClosure;