8274773: [TESTBUG] UnsafeIntrinsicsTest intermittently fails on weak memory model platform

TheRealMDoerr · TheRealMDoerr · commit 19a196996701 · 2021-11-25T13:43:43.000Z
Backport-of: 49f8ce6e9c797cd11ea586e3cf87398888bc8cf1
diff --git a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java
@@ -285,6 +285,7 @@ private Node merge(Node startNode, Node expectedNext, Node head, boolean test_fa
     private Node mergeImplLoad(Node startNode, Node expectedNext, Node head) {
         // Atomic load version
         Node temp = (Node) UNSAFE.getObject(startNode, offset);
+        UNSAFE.storeFence(); // Make all new Node fields visible to concurrent readers.
         startNode.setNext(head);
         return temp;
     }

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ private Node merge(Node startNode, Node expectedNext, Node head, boolean test_fa`
`285`	`285`	`private Node mergeImplLoad(Node startNode, Node expectedNext, Node head) {`
`286`	`286`	`// Atomic load version`
`287`	`287`	`Node temp = (Node) UNSAFE.getObject(startNode, offset);`
	`288`	`+ UNSAFE.storeFence(); // Make all new Node fields visible to concurrent readers.`
`288`	`289`	`startNode.setNext(head);`
`289`	`290`	`return temp;`
`290`	`291`	`}`