diff -r 04946947ca79 -r 3f35a9efd7de src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp	Wed Oct 16 11:12:47 2019 +0100
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp	Fri Oct 18 13:07:46 2019 -0400
@@ -84,7 +84,9 @@
 
   void write_ref_field_work(void* v, oop o, bool release = false);
 
-  oop oop_load_from_native_barrier(oop obj);
+  oop oop_load_from_native_barrier(oop obj, oop* load_addr);
+  oop oop_load_from_native_barrier(oop obj, narrowOop* load_addr);
+
 
   virtual void on_thread_create(Thread* thread);
   virtual void on_thread_destroy(Thread* thread);