More tidy up.

Author: aardvark179

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

@@ -32,27 +32,27 @@ public static abstract class UnwrapNativeNode extends RubyBaseNode {
         public abstract Object execute(long handle);
 
         @Specialization(guards = "handle == FALSE_HANDLE")
-        public Object unwrapFalse(long handle) {
+        public boolean unwrapFalse(long handle) {
             return false;
         }
 
         @Specialization(guards = "handle == TRUE_HANDLE")
-        public Object unwrapTrue(long handle) {
+        public boolean unwrapTrue(long handle) {
             return true;
         }
 
         @Specialization(guards = "handle == UNDEF_HANDLE")
-        public Object unwrapUndef(long handle) {
+        public NotProvided unwrapUndef(long handle) {
             return NotProvided.INSTANCE;
         }
 
         @Specialization(guards = "handle == NIL_HANDLE")
-        public Object unwrapNil(long handle) {
+        public DynamicObject unwrapNil(long handle) {
             return nil();
         }
 
         @Specialization(guards = "isTaggedLong(handle)")
-        public Object unwrapTaggedLong(long handle) {
+        public long unwrapTaggedLong(long handle) {
             return handle >> 1;
         }
 

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

@@ -26,19 +26,18 @@ public class ValueWrapperManager {
      * These constants are taken from ruby.h, and are based on us not tagging doubles.
      */
 
-    public static final int FALSE_HANDLE = 0x0;
-    public static final int TRUE_HANDLE = 0x2;
-    public static final int NIL_HANDLE = 0x04;
-    public static final int UNDEF_HANDLE = 0x6;
+    public static final int FALSE_HANDLE = 0b000;
+    public static final int TRUE_HANDLE = 0b010;
+    public static final int NIL_HANDLE = 0b100;
+    public static final int UNDEF_HANDLE = 0b110;
 
     public static final long LONG_TAG = 1;
     public static final long OBJECT_TAG = 0;
 
     public static final long MIN_FIXNUM_VALUE = -(1L << 62);
     public static final long MAX_FIXNUM_VALUE = (1L << 62) - 1;
 
-    public static final int TAG_BITS = 3;
-    public static final long TAG_MASK = 0x7;
+    public static final long TAG_MASK = 0b111;
 
     private final LongHashMap<WeakReference<DynamicObject>> handleMap = new LongHashMap<>(1024);
 

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

@@ -21,19 +21,17 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.profiles.BranchProfile;
 
 public abstract class WrapNode extends RubyBaseNode {
 
     public abstract TruffleObject execute(Object value);
 
     @Specialization
-    public DynamicObject wrapInt(int value) {
-        return wrapLong(value);
-    }
-
-    @Specialization
-    public DynamicObject wrapLong(long value) {
+    public DynamicObject wrapLong(long value,
+            @Cached("create()") BranchProfile smallFixnumProfile) {
         if (value >= ValueWrapperManager.MIN_FIXNUM_VALUE && value <= ValueWrapperManager.MAX_FIXNUM_VALUE) {
+            smallFixnumProfile.enter();
             long val = (value << 1) | LONG_TAG;
             return Layouts.VALUE_WRAPPER.createValueWrapper(value, val);
         } else {
@@ -69,9 +67,11 @@ public DynamicObject wrapNil(DynamicObject value) {
     @Specialization(guards = { "isRubyBasicObject(value)", "!isNil(value)" })
     public DynamicObject wrapValue(DynamicObject value,
             @Cached("createReader()") ReadObjectFieldNode readWrapperNode,
-            @Cached("createWriter()") WriteObjectFieldNode writeWrapperNode) {
+            @Cached("createWriter()") WriteObjectFieldNode writeWrapperNode,
+            @Cached("create()") BranchProfile noHandleProfile) {
         DynamicObject wrapper = (DynamicObject) readWrapperNode.execute(value);
         if (wrapper == null) {
+            noHandleProfile.enter();
             synchronized (value) {
                 wrapper = (DynamicObject) readWrapperNode.execute(value);
                 if (wrapper == null) {