From 4fbf49c3b09d046c5e1be8e14f0cff09548cd091 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Tue, 18 Sep 2018 05:32:45 +0100
Subject: [PATCH] concurrent/cached_value: Volatile result access

Refs #300
---
 lib/i18n/tasks/concurrent/cached_value.rb | 42 ++++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/lib/i18n/tasks/concurrent/cached_value.rb b/lib/i18n/tasks/concurrent/cached_value.rb
index bafe65bc..fe7f4129 100644
--- a/lib/i18n/tasks/concurrent/cached_value.rb
+++ b/lib/i18n/tasks/concurrent/cached_value.rb
@@ -13,23 +13,47 @@ class CachedValue
     def initialize(&computation)
       @computation = computation
       @mutex = Mutex.new
-
-      # Ruby instance variables are currently implicitly "volatile" in all major implementations, see:
-      # https://bugs.ruby-lang.org/issues/11539
-      #
-      # If the Ruby specification changes, this variable must be marked "volatile".
       @result = NULL
     end
 
     # @return [Object] Result of the computation.
     def get
-      return @result unless @result == NULL
+      return get_result_volatile unless get_result_volatile == NULL
       @mutex.synchronize do
-        next unless @result == NULL
-        @result = @computation.call
+        next unless get_result_volatile == NULL
+        set_result_volatile @computation.call
         @computation = nil
       end
-      @result
+      get_result_volatile
+    end
+
+    private
+
+    # Ruby instance variable volatility is currently unspecified:
+    # https://bugs.ruby-lang.org/issues/11539
+    #
+    # Below are the implementations for major ruby engines, based on concurrent-ruby.
+    # rubocop:disable Lint/DuplicateMethods,Naming/AccessorMethodName
+    case RUBY_ENGINE
+    when 'rbx'
+      def get_result_volatile
+        Rubinius.memory_barrier
+        @result
+      end
+
+      def set_result_volatile(value)
+        @result = value
+        Rubinius.memory_barrier
+      end
+    else
+      def get_result_volatile
+        @result
+      end
+
+      def set_result_volatile(value)
+        @result = value
+      end
     end
+    # rubocop:enable Lint/DuplicateMethods,Naming/AccessorMethodName
   end
 end