diff -r 78aa7484c722 -r 88502b1cf76f src/hotspot/share/gc/shared/barrierSetNMethod.hpp
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp	Tue Nov 26 14:33:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp	Mon Sep 09 11:43:16 2019 -0400
@@ -34,13 +34,14 @@
 class BarrierSetNMethod: public CHeapObj<mtGC> {
   bool supports_entry_barrier(nmethod* nm);
   void deoptimize(nmethod* nm, address* return_addr_ptr);
+  int disarmed_value() const;
 
 protected:
-  virtual int disarmed_value() const;
   virtual bool nmethod_entry_barrier(nmethod* nm) = 0;
 
 public:
   virtual ByteSize thread_disarmed_offset() const = 0;
+  virtual int* disarmed_value_address() const = 0;
 
   static int nmethod_stub_entry_barrier(address* return_address_ptr);
   bool nmethod_osr_entry_barrier(nmethod* nm);