Adjust true/nil/undef values based on the changes in special_consts.h

Author: eregon

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

@@ -42,22 +42,20 @@ public final class ValueWrapperManager {
 
     static final long UNSET_HANDLE = -2L;
 
-    /* These constants are taken from ruby.h, and are based on us not tagging doubles. */
+    /* These constants are taken from lib/cext/include/ruby/internal/special_consts.h with USE_FLONUM=false */
 
-    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 int FALSE_HANDLE = 0b0000;
+    public static final int TRUE_HANDLE = 0b0110;
+    public static final int NIL_HANDLE = 0b0010;
+    public static final int UNDEF_HANDLE = 0b1010;
+    public static final long IMMEDIATE_MASK = 0b0011;
 
     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 long TAG_MASK = 0b111;
-    public static final long TAG_BITS = 3;
-
     public final ValueWrapper trueWrapper = new ValueWrapper(true, TRUE_HANDLE, null);
     public final ValueWrapper falseWrapper = new ValueWrapper(false, FALSE_HANDLE, null);
     public final ValueWrapper undefWrapper = new ValueWrapper(NotProvided.INSTANCE, UNDEF_HANDLE, null);
@@ -177,9 +175,10 @@ public long totalHandleAllocations() {
         return counter.get();
     }
 
+    private static final long ADDRESS_ALIGN_BITS = 3;
     private static final int BLOCK_BITS = 15;
-    private static final int BLOCK_SIZE = 1 << (BLOCK_BITS - TAG_BITS);
-    private static final int BLOCK_BYTE_SIZE = BLOCK_SIZE << TAG_BITS;
+    private static final int BLOCK_SIZE = 1 << (BLOCK_BITS - ADDRESS_ALIGN_BITS);
+    private static final int BLOCK_BYTE_SIZE = BLOCK_SIZE << ADDRESS_ALIGN_BITS;
     private static final long BLOCK_MASK = -1L << BLOCK_BITS;
     private static final long OFFSET_MASK = ~BLOCK_MASK;
     public static final long ALLOCATION_BASE = 0x0badL << 48;
@@ -245,7 +244,7 @@ public int getIndex() {
         }
 
         public ValueWrapper getWrapper(long handle) {
-            int offset = (int) (handle & OFFSET_MASK) >> TAG_BITS;
+            int offset = (int) (handle & OFFSET_MASK) >> ADDRESS_ALIGN_BITS;
             return wrappers[offset].get();
         }
 
@@ -371,7 +370,7 @@ public static boolean isTaggedLong(long handle) {
     }
 
     public static boolean isTaggedObject(long handle) {
-        return handle != FALSE_HANDLE && (handle & TAG_MASK) == OBJECT_TAG;
+        return handle != FALSE_HANDLE && (handle & IMMEDIATE_MASK) == OBJECT_TAG;
     }
 
     public static boolean isMallocAligned(long handle) {

src/main/java/org/truffleruby/language/objects/ObjectIDOperations.java

@@ -108,7 +108,7 @@ public static boolean isFloatID(BigInteger id) {
     }
 
     public static boolean isBasicObjectID(long id) {
-        return id != 0 && (id & ValueWrapperManager.TAG_MASK) == 0;
+        return id != FALSE && (id & ValueWrapperManager.IMMEDIATE_MASK) == 0;
     }
 
     @TruffleBoundary // BigInteger

test/truffle/compiler/pe/core/objectid_pe.rb

@@ -6,9 +6,9 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-example "nil.object_id", 4
+example "nil.object_id", 2
 
-example "true.object_id", 2
+example "true.object_id", 6
 
 example "false.object_id", 0
 

test/truffle/compiler/pe/pe.rb

@@ -144,13 +144,13 @@ def report(status, code, message = nil)
             if value == example.expected_value
               report 'OK', example.code
             else
-              report 'INCORRECT', example.code, "was: #{$value.inspect} and not: #{example.expected_value.inspect}"
+              report 'INCORRECT', example.code, "was: #{value.inspect} and not: #{example.expected_value.inspect}"
               failed += 1
             end
           end
         else
           if constant
-            report 'QUERY', example.code, "wasn't supposed to be constant but it was (#{$value.inspect})"
+            report 'QUERY', example.code, "wasn't supposed to be constant but it was (#{value.inspect})"
             failed += 1
           else
             report 'OK (counter)', example.code