src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/WriteBarrierVerificationPhase.java

*** 42,51 ****
--- 42,52 ----
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
  import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
  import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode;
+ import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
  import org.graalvm.compiler.nodes.memory.FixedAccessNode;
  import org.graalvm.compiler.nodes.memory.HeapAccess;
  import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
  import org.graalvm.compiler.nodes.memory.ReadNode;
  import org.graalvm.compiler.nodes.memory.WriteNode;
*** 125,134 ****
--- 126,138 ----
          final Node next = node.next();
          final Node previous = node.predecessor();
          boolean validatePreBarrier = useG1GC() && (isObjectWrite(node) || !((ArrayRangeWrite) node).isInitialization());
          if (node instanceof WriteNode) {
              WriteNode writeNode = (WriteNode) node;
+             if (config.useDeferredInitBarriers && writeNode.getLocationIdentity().isInit()) {
+                 return true;
+             }
              if (writeNode.getLocationIdentity().isInit()) {
                  validatePreBarrier = false;
              }
          }
          if (isObjectWrite(node)) {
*** 189,199 ****
              throw GraalError.shouldNotReachHere(String.format("unexpected write node %s", write));
          }
      }
  
      private static boolean validateBarrier(FixedAccessNode write, ObjectWriteBarrier barrier) {
!         assert write instanceof WriteNode || write instanceof LogicCompareAndSwapNode || write instanceof LoweredAtomicReadAndWriteNode : "Node must be of type requiring a write barrier " + write;
          if (!barrier.usePrecise()) {
              if (barrier.getAddress() instanceof OffsetAddressNode && write.getAddress() instanceof OffsetAddressNode) {
                  return GraphUtil.unproxify(((OffsetAddressNode) barrier.getAddress()).getBase()) == GraphUtil.unproxify(((OffsetAddressNode) write.getAddress()).getBase());
              }
          }
--- 193,204 ----
              throw GraalError.shouldNotReachHere(String.format("unexpected write node %s", write));
          }
      }
  
      private static boolean validateBarrier(FixedAccessNode write, ObjectWriteBarrier barrier) {
!         assert write instanceof WriteNode || write instanceof LogicCompareAndSwapNode || write instanceof ValueCompareAndSwapNode ||
!                         write instanceof LoweredAtomicReadAndWriteNode : "Node must be of type requiring a write barrier " + write;
          if (!barrier.usePrecise()) {
              if (barrier.getAddress() instanceof OffsetAddressNode && write.getAddress() instanceof OffsetAddressNode) {
                  return GraphUtil.unproxify(((OffsetAddressNode) barrier.getAddress()).getBase()) == GraphUtil.unproxify(((OffsetAddressNode) write.getAddress()).getBase());
              }
          }