Split detect_recursion for single objects and pairs of objects

Author: chrisseaton

spec/truffle/thread/detect_recursion_spec.rb

@@ -25,13 +25,13 @@ def self.check_recursion_to_depth(obj, depth)
 
   def self.check_double_recursion_equality_to_depth(obj1, obj2, depth)
     # checks that obj1 and obj2 are both recursive and equal structurally
-    # (because detect_recursion on two objects is only used during object comparison,
+    # (because detect_pair_recursion on two objects is only used during object comparison,
     # and aborts after inequality is discovered)
     return false unless obj1.class == obj2.class
     return false unless obj1.respond_to?(:each)
     return false unless obj1.size == obj2.size
 
-    Truffle::ThreadOperations.detect_recursion(obj1, obj2) do
+    Truffle::ThreadOperations.detect_pair_recursion(obj1, obj2) do
       if depth > 1
         if obj1.class == Hash
           obj1.each do |key, val|

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

@@ -89,7 +89,7 @@ def <=>(other)
 
     total = other.size
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_recursion self, other do
       i = 0
       count = Primitive.min(total, size)
 
@@ -132,7 +132,7 @@ def ==(other)
 
     return false unless size == other.size
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_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
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_recursion self, other do
       i = 0
       each do |x|
         return false unless x.eql? other[i]

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

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

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

@@ -137,7 +137,7 @@ def eql_op(op, other)
 
     return false unless other.size == size
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_recursion self, other do
       each_pair do |key, value|
         other_value = other._get_or_undefined(key)
 

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

@@ -1585,7 +1585,7 @@ def <=>(other)
       return Primitive.string_cmp self, other
     end
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_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)

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

@@ -188,7 +188,7 @@ def to_s
   def ==(other)
     return false if self.class != other.class
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_recursion self, other do
       return self.values == other.values
     end
 
@@ -270,7 +270,7 @@ def eql?(other)
     return true if equal? other
     return false if self.class != other.class
 
-    Truffle::ThreadOperations.detect_recursion self, other do
+    Truffle::ThreadOperations.detect_pair_recursion self, other do
       _attrs.each do |var|
         mine =   Primitive.object_hidden_var_get(self, var)
         theirs = Primitive.object_hidden_var_get(other, var)

src/main/ruby/truffleruby/core/truffle/thread_operations.rb

@@ -63,10 +63,37 @@
 module Truffle::ThreadOperations
 
   # detect_recursion will return if there's a recursion
-  # on obj (or the pair obj+paired_obj).
+  # on obj.
   # If there is one, it returns true.
   # Otherwise, it will yield once and return false.
-  def self.detect_recursion(obj, paired_obj=nil)
+  def self.detect_recursion(obj)
+    unless Primitive.object_can_contain_object obj
+      yield
+      return false
+    end
+
+    id = obj.object_id
+    objects = Primitive.thread_recursive_objects
+
+    if objects[id]
+      true
+    else
+      objects[id] = true
+      begin
+        yield
+      ensure
+        objects.delete id
+      end
+      false
+    end
+  end
+  Truffle::Graal.always_split method(:detect_recursion)
+
+  # detect_recursion will return if there's a recursion
+  # on the pair obj+paired_obj.
+  # If there is one, it returns true.
+  # Otherwise, it will yield once and return false.
+  def self.detect_pair_recursion(obj, paired_obj)
     unless Primitive.object_can_contain_object obj
       yield
       return false
@@ -118,7 +145,7 @@ def self.detect_recursion(obj, paired_obj=nil)
 
     false
   end
-  Truffle::Graal.always_split method(:detect_recursion)
+  Truffle::Graal.always_split method(:detect_pair_recursion)
 
   class InnerRecursionDetected < Exception; end # rubocop:disable Lint/InheritException