Convert wrapping, unwrapping, and fast fixnum conversions to macros.

PullRequest: truffleruby/745

Author: aardvark179

lib/cext/include/ruby/ruby.h

@@ -230,9 +230,9 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
 #define FIXNUM_MAX RUBY_FIXNUM_MAX
 #define FIXNUM_MIN RUBY_FIXNUM_MIN
 
-VALUE RB_INT2FIX(long value);
+#define RB_INT2FIX(i) (VALUE)rb_tr_wrap((long)(i))
 #define INT2FIX(i) RB_INT2FIX(i)
-VALUE RB_LONG2FIX(long value);
+#define RB_LONG2FIX(i) (VALUE)rb_tr_wrap((long)(i))
 #define LONG2FIX(i) RB_INT2FIX(i)
 #define rb_fix_new(v) RB_INT2FIX(v)
 VALUE rb_int2inum(intptr_t);

lib/cext/include/truffleruby/truffleruby-pre.h

@@ -45,13 +45,8 @@ extern void* rb_tr_cext;
 
 // Wrapping and unwrapping of values.
 
-MUST_INLINE VALUE rb_tr_wrap(VALUE object) {
-  return polyglot_invoke(RUBY_CEXT, "rb_tr_wrap", object);
-}
-
-MUST_INLINE VALUE rb_tr_unwrap(VALUE object) {
-  return polyglot_invoke(RUBY_CEXT, "rb_tr_unwrap", object);
-}
+#define rb_tr_wrap(object) polyglot_invoke(RUBY_CEXT, "rb_tr_wrap", object)
+#define rb_tr_unwrap(object) polyglot_invoke(RUBY_CEXT, "rb_tr_unwrap", object)
 
 // Needed for GC guarding
 

src/main/c/cext/ruby.c

@@ -342,14 +342,6 @@ short rb_fix2short(VALUE value) {
   rb_tr_error("rb_num2ushort not implemented");
 }
 
-VALUE RB_INT2FIX(long value) {
-  return rb_tr_wrap(polyglot_invoke(RUBY_CEXT, "INT2FIX", value));
-}
-
-VALUE RB_LONG2FIX(long value) {
-  return rb_tr_wrap(polyglot_invoke(RUBY_CEXT, "LONG2FIX", value));
-}
-
 long rb_fix2int(VALUE value) {
   return polyglot_as_i32(RUBY_CEXT_INVOKE_NO_WRAP("rb_fix2int", value));
 }

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -199,22 +199,6 @@ private Object execute(TruffleObject receiver, Object[] args, Node executeNode,
 
     }
 
-    // TODO (pitr-ch 14-Dec-2017): remove from java
-    @CoreMethod(names = "INT2FIX", onSingleton = true, required = 1)
-    public abstract static class INT2FIXNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        public int int2fix(int num) {
-            return num;
-        }
-
-        @Specialization
-        public long int2fix(long num) {
-            return num;
-        }
-
-    }
-
     @CoreMethod(names = "rb_ulong2num", onSingleton = true, required = 1)
     public abstract static class ULong2NumNode extends CoreMethodArrayArgumentsNode {
 
@@ -442,16 +426,6 @@ public Object dbl2big(double num,
 
     }
 
-    @CoreMethod(names = "LONG2FIX", onSingleton = true, required = 1)
-    public abstract static class LONG2FIXNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        public long long2fix(long num) {
-            return num;
-        }
-
-    }
-
     @CoreMethod(names = "rb_class_of", onSingleton = true, required = 1)
     public abstract static class RBClassOfNode extends CoreMethodArrayArgumentsNode {