objspace tweaks to work with latest lib/mri/objspace.rb

Author: eregon

lib/mri/objspace.rb

@@ -8,7 +8,7 @@ module ObjectSpace
   class << self
     private :_dump
     private :_dump_all
-    private :_dump_shapes if method_defined?(:_dump_shapes)
+    private :_dump_shapes unless defined?(::TruffleRuby)
   end
 
   module_function
@@ -140,5 +140,5 @@ def dump_shapes(output: :file, since: 0)
     ret = _dump_shapes(out, since)
     return nil if output == :stdout
     ret
-  end
+  end unless defined?(::TruffleRuby)
 end

lib/truffle/objspace.rb

@@ -120,7 +120,7 @@ def _dump(object, output)
   end
 
   # Helper method for ObjectSpace.dump_all
-  def _dump_all(output, full, since)
+  def _dump_all(output, full, since, shapes)
     if Primitive.is_a?(output, String)
       objects = []
       ObjectSpace.each_object do |object|
@@ -129,7 +129,7 @@ def _dump_all(output, full, since)
       objects.join("\n")
     else
       # IO
-      output.write _dump_all('', full, since)
+      output.write _dump_all('', full, since, shapes)
       output
     end
   end