Move exception format logic to Ruby.

Author: aardvark179

lib/truffle/truffle/cext.rb

@@ -1142,6 +1142,10 @@ def rb_check_arity(arg_count, min, max)
     Truffle::Type.check_arity arg_count, min, max
   end
 
+  def rb_arity_error_string(arg_count, min, max)
+    Truffle::Type.arity_error_string(arg_count, min, max)
+  end
+
   def rb_raise(object, name)
     raise 'not implemented'
   end

src/main/c/cext/ruby.c

@@ -3468,23 +3468,9 @@ VALUE rb_enum_values_pack(int argc, const VALUE *argv) {
   rb_tr_error("rb_enum_values_pack not implemented");
 }
 
-static inline VALUE rb_arity_error_new(int argc, int min, int max) {
-  VALUE err_mess = 0;
-  if (min == max) {
-	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d)", argc, min);
-  }
-  else if (max == UNLIMITED_ARGUMENTS) {
-	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d+)", argc, min);
-  }
-  else {
-	err_mess = rb_sprintf("wrong number of arguments (given %d, expected %d..%d)", argc, min, max);
-  }
-  return rb_exc_new3(rb_eArgError, err_mess);
-}
 
-NORETURN(void rb_error_arity(int argc, int min, int max))
-{
-  rb_exc_raise(rb_arity_error_new(argc, min, max));
+NORETURN(void rb_error_arity(int argc, int min, int max)) {
+  rb_exc_raise(rb_exc_new3(rb_eArgError, rb_tr_wrap(polyglot_invoke(RUBY_CEXT, "rb_arity_error_string", argc, min, max))));
 }
 
 void rb_error_untrusted(VALUE obj) {

src/main/ruby/core/type.rb

@@ -611,15 +611,18 @@ def self.object_respond_to_marshal_load?(obj)
 
     def self.check_arity(arg_count, min, max)
       if arg_count < min || (max != -1 && arg_count > max)
-        error_message = case
-                        when min == max
-                          'wrong number of arguments (given %d, expected %d)' % [arg_count, min]
-                        when max == -1
-                          'wrong number of arguments (given %d, expected %d+)' % [arg_count, min]
-                        else
-                          'wrong number of arguments (given %d, expected %d..%d)' % [arg_count, min, max]
-                        end
-        raise ArgumentError, error_message
+        raise ArgumentError, arity_error_string(arg_count, min, max)
+      end
+    end
+
+    def self.arity_error_string(arg_count, min, max)
+      case
+      when min == max
+        'wrong number of arguments (given %d, expected %d)' % [arg_count, min]
+      when max == -1
+        'wrong number of arguments (given %d, expected %d+)' % [arg_count, min]
+      else
+        'wrong number of arguments (given %d, expected %d..%d)' % [arg_count, min, max]
       end
     end