From ce1a82a1e4b72c032500ed709da6a216469b624e Mon Sep 17 00:00:00 2001
From: Rika Ichinose <rrunewalsh@gmail.com>
Date: Fri, 10 Nov 2023 00:22:46 +0300
Subject: [PATCH] Add potentially required barriers to TEnconding.

---
 rtl/objpas/sysutils/sysencoding.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rtl/objpas/sysutils/sysencoding.inc b/rtl/objpas/sysutils/sysencoding.inc
index fd9d91dfdc..4ab506b605 100644
--- a/rtl/objpas/sysutils/sysencoding.inc
+++ b/rtl/objpas/sysutils/sysencoding.inc
@@ -19,10 +19,16 @@ class function TEncoding.GetStandard(Se: TStandardEncoding; Ctr: TCreateEncoding
 begin
   Result := FStandardEncodings[Se];
   if Assigned(Result) then
+  begin
+{$ifdef FPC_HAS_FEATURE_THREADING}
+    ReadDependencyBarrier; // Read Result contents (by caller) after Result pointer.
+{$endif}
     Exit;
+  end;
 
   Result := Ctr();
 {$ifdef FPC_HAS_FEATURE_THREADING}
+  WriteBarrier; // Write FStandardEncodings[Se] after Result contents.
   if InterlockedCompareExchange(Pointer(FStandardEncodings[Se]), Pointer(Result), nil) <> nil then
   begin
     Result.Free;
@@ -110,6 +116,9 @@ begin
   repeat
     Cp := DefaultSystemCodePage;
     Head := FSystemEncodingsList; // Must not be re-read until InterlockedCompareExchange to guarantee that search was performed against this head.
+{$ifdef FPC_HAS_FEATURE_THREADING}
+    ReadDependencyBarrier; // Read Head contents after Head pointer.
+{$endif}
     Result := Head;
     while Assigned(Result) do
       if Result.CodePage = Cp then
@@ -121,6 +130,7 @@ begin
     Result := TMBCSEncoding.Create(Cp);
     Result.FNext := Head;
 {$ifdef FPC_HAS_FEATURE_THREADING}
+    WriteBarrier; // Write FSystemEncodingsList after Result contents.
     if InterlockedCompareExchange(Pointer(FSystemEncodingsList), Pointer(Result), Pointer(Head)) = Pointer(Head) then
       break
     else