--- old/src/hotspot/share/gc/g1/g1SharedClosures.hpp	2020-01-17 14:16:52.333077437 +0100
+++ new/src/hotspot/share/gc/g1/g1SharedClosures.hpp	2020-01-17 14:16:52.141074882 +0100
@@ -40,14 +40,7 @@
 public:
   G1ParCopyClosure<G1BarrierNone, Mark> _oops;
   G1ParCopyClosure<G1BarrierCLD,  Mark> _oops_in_cld;
-  // We do not need (and actually should not) collect oops from nmethods into the
-  // optional collection set as we already automatically collect the corresponding
-  // nmethods in the region's strong code roots set. So set G1BarrierNoOptRoots in
-  // this closure.
-  // If these were present there would be opportunity for multiple threads to try
-  // to change this oop* at the same time. Since embedded oops are not necessarily
-  // word-aligned, this could lead to word tearing during update and crashes.
-  G1ParCopyClosure<G1BarrierNoOptRoots, Mark> _oops_in_nmethod;
+  G1ParCopyClosure<G1BarrierNMethod, Mark> _oops_in_nmethod;
 
   G1CLDScanClosure                _clds;
   G1CodeBlobClosure               _codeblobs;