--- old/src/share/vm/oops/oop.inline.hpp	2019-11-11 16:10:10.127342160 +0100
+++ new/src/share/vm/oops/oop.inline.hpp	2019-11-11 16:10:10.042342165 +0100
@@ -307,6 +307,9 @@
   }
 #if INCLUDE_ALL_GCS
   if (UseShenandoahGC) {
+    if (exchange_value != NULL) {
+      ShenandoahBarrierSet::barrier_set()->storeval_barrier(exchange_value);
+    }
     result = ShenandoahBarrierSet::barrier_set()->load_reference_barrier(result);
   }
 #endif