Merge pull request #702 from HoneyryderChuck/issue-695

Fix race condition for multi-thread support
ruby · Jul 12, 2021 · 4981f59 · 4981f59
2 parents 21c85fd + 4e67199
commit 4981f59
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/lib/rbs/definition_builder.rb b/lib/rbs/definition_builder.rb
@@ -774,26 +774,10 @@ def merge_method(type_name, methods, name, method, sub, implemented_in: :keep, k
     end
 
     def try_cache(type_name, cache:, key: type_name)
-      # @type var cc: Hash[untyped, Definition | false | nil]
+      # @type var cc: Hash[untyped, Definition | nil]
       cc = _ = cache
-      cached = cc[key]
 
-      case cached
-      when Definition
-        cached
-      when false
-        raise
-      when nil
-        cc[key] = false
-        begin
-          cc[key] = yield
-        rescue => ex
-          cc.delete(key)
-          raise ex
-        end
-      else
-        raise
-      end
+      cc[key] ||= yield
     end
 
     def expand_alias(type_name)