Move recursion utilities into Truffle::ThreadOperations

Author: chrisseaton

lib/truffle/truffle/cext.rb

@@ -1508,7 +1508,7 @@ def rb_rescue2(b_proc, data1, r_proc, data2, rescued)
   def rb_exec_recursive(func, obj, arg)
     result = nil
 
-    recursive = Thread.detect_recursion(obj) do
+    recursive = Truffle::ThreadOperations.detect_recursion(obj) do
       result = Primitive.cext_unwrap(Primitive.call_with_c_mutex(func, [Primitive.cext_wrap(obj), Primitive.cext_wrap(arg), 0]))
     end
 

spec/truffle/thread/detect_recursion_spec.rb

@@ -12,7 +12,7 @@ module TruffleThreadDetectRecursionSpecFixtures
   def self.check_recursion_to_depth(obj, depth)
     # checks that obj recurses to a given depth
     return false unless obj.respond_to?(:each)
-    Thread.detect_recursion(obj) do 
+    Truffle::ThreadOperations.detect_recursion(obj) do 
       if depth > 1
         obj.each do |el|
           if check_recursion_to_depth(el, depth-1)
@@ -31,7 +31,7 @@ def self.check_double_recursion_equality_to_depth(obj1, obj2, depth)
     return false unless obj1.respond_to?(:each)
     return false unless obj1.size == obj2.size
 
-    Thread.detect_recursion(obj1, obj2) do
+    Truffle::ThreadOperations.detect_recursion(obj1, obj2) do
       if depth > 1
         if obj1.class == Hash
           obj1.each do |key, val|

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -1064,6 +1064,7 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/truffle/exception_operations.rb",
             "/core/truffle/feature_loader.rb",
             "/core/truffle/gem_util.rb",
+            "/core/truffle/thread_operations.rb",
             "/core/thread.rb",
             "/core/true.rb",
             "/core/type.rb",

src/main/ruby/truffleruby/core/array.rb

@@ -89,7 +89,7 @@ def <=>(other)
 
     total = other.size
 
-    Thread.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_recursion self, other do
       i = 0
       count = Primitive.min(total, size)
 
@@ -132,7 +132,7 @@ def ==(other)
 
     return false unless size == other.size
 
-    Thread.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_recursion self, other do
       i = 0
       total = size
 
@@ -325,7 +325,7 @@ def eql?(other)
     return false unless other.kind_of?(Array)
     return false if size != other.size
 
-    Thread.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_recursion self, other do
       i = 0
       each do |x|
         return false unless x.eql? other[i]
@@ -484,7 +484,7 @@ def hash
 
       # If we've seen self, unwind back to the outer version
       if objects.key? id
-        raise Thread::InnerRecursionDetected
+        raise Truffle::ThreadOperations::InnerRecursionDetected
       end
 
       # .. or compute the hash value like normal
@@ -508,13 +508,13 @@ def hash
         # An inner version will raise to return back here, indicating that
         # the whole structure is recursive. In which case, abandon most of
         # the work and return a simple hash value.
-      rescue Thread::InnerRecursionDetected
-        return size
+      rescue Truffle::ThreadOperations::InnerRecursionDetected
+      return size
       ensure
         objects.delete :__detect_outermost_recursion__
         objects.delete id
-      end
     end
+  end
 
     hash_val
   end
@@ -549,7 +549,7 @@ def inspect
     comma = ', '
     result = +'['
 
-    return +'[...]' if Thread.detect_recursion self do
+    return +'[...]' if Truffle::ThreadOperations.detect_recursion self do
       each_with_index do |element, index|
         temp = Truffle::Type.rb_inspect(element)
         result.force_encoding(temp.encoding) if index == 0
@@ -568,7 +568,7 @@ def join(sep=nil)
     return ''.encode(Encoding::US_ASCII) if size == 0
 
     out = +''
-    raise ArgumentError, 'recursive array join' if Thread.detect_recursion self do
+    raise ArgumentError, 'recursive array join' if Truffle::ThreadOperations.detect_recursion self do
       sep = Primitive.nil?(sep) ? $, : StringValue(sep)
 
       # We've manually unwound the first loop entry for performance
@@ -1263,7 +1263,7 @@ def recursively_flatten(array, out, max_levels = -1)
     end
 
     max_levels -= 1
-    recursion = Thread.detect_recursion(array) do
+    recursion = Truffle::ThreadOperations.detect_recursion(array) do
       array = Truffle::Type.coerce_to(array, Array, :to_ary)
 
       i = 0

src/main/ruby/truffleruby/core/comparable.rb

@@ -30,7 +30,7 @@ module Comparable
   def ==(other)
     return true if equal?(other)
 
-    return false if Thread.detect_recursion(self, other) do
+    return false if Truffle::ThreadOperations.detect_recursion(self, other) do
       unless comp = (self <=> other)
         return false
       end

src/main/ruby/truffleruby/core/enumerator.rb

@@ -704,7 +704,7 @@ def rewind
   end
 
   def inspect
-    return "#<#{self.class.name}: ...>" if Thread.detect_recursion(self) do
+    return "#<#{self.class.name}: ...>" if Truffle::ThreadOperations.detect_recursion(self) do
       return "#<#{self.class.name}: #{@enums}>"
     end
   end

src/main/ruby/truffleruby/core/file.rb

@@ -733,7 +733,7 @@ def self.join(*args)
     when String
       first = first.dup
     when Array
-      recursion = Thread.detect_recursion(first) do
+      recursion = Truffle::ThreadOperations.detect_recursion(first) do
         first = join(*first)
       end
 
@@ -754,7 +754,7 @@ def self.join(*args)
       when String
         value = el
       when Array
-        recursion = Thread.detect_recursion(el) do
+        recursion = Truffle::ThreadOperations.detect_recursion(el) do
           value = join(*el)
         end
 

src/main/ruby/truffleruby/core/hash.rb

@@ -137,7 +137,7 @@ def eql_op(op, other)
 
     return false unless other.size == size
 
-    Thread.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_recursion self, other do
       each_pair do |key, value|
         other_value = other._get_or_undefined(key)
 
@@ -361,7 +361,7 @@ def to_h
   def hash
     val = Primitive.vm_hash_start CLASS_SALT
     val = Primitive.vm_hash_update val, size
-    Thread.detect_outermost_recursion self do
+    Truffle::ThreadOperations.detect_outermost_recursion self do
       each_pair do |key,value|
         entry_val = Primitive.vm_hash_start key.hash
         entry_val = Primitive.vm_hash_update entry_val, value.hash
@@ -406,7 +406,7 @@ def index(value)
 
   def inspect
     out = []
-    return +'{...}' if Thread.detect_recursion self do
+    return +'{...}' if Truffle::ThreadOperations.detect_recursion self do
       each_pair do |key,value|
         str =  Truffle::Type.rb_inspect(key)
         str << '=>'

src/main/ruby/truffleruby/core/kernel.rb

@@ -380,18 +380,17 @@ def inspect
       return Primitive.infect "#{prefix}>", self
     end
 
-    # If it's already been inspected, return the ...
-    return "#{prefix} ...>" if Thread.guarding? self
-
-    parts = Thread.recursion_guard self do
-      ivars.map do |var|
+    Truffle::ThreadOperations.detect_recursion(self) do
+      parts = ivars.map do |var|
         value = Primitive.object_ivar_get self, var
         "#{var}=#{value.inspect}"
       end
+      str = "#{prefix} #{parts.join(', ')}>"
+      return Primitive.infect str, self
     end
 
-    str = "#{prefix} #{parts.join(', ')}>"
-    Primitive.infect str, self
+    # If it's already been inspected, return the ...
+    "#{prefix} ...>"
   end
 
   def load(filename, wrap = false)

src/main/ruby/truffleruby/core/string.rb

@@ -1585,7 +1585,7 @@ def <=>(other)
       return Primitive.string_cmp self, other
     end
 
-    Thread.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_recursion self, other do
       if other.respond_to?(:<=>) && !other.respond_to?(:to_str)
         return nil unless tmp = (other <=> self)
       elsif other.respond_to?(:to_str)