jruby · May 10, 2015 · May 10, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java
@@ -63,10 +63,6 @@ public static boolean isRubyModule(Object value) {
         return value instanceof RubyModule;
     }
 
-    public static boolean isRubyNilClass(Object value) {
-        return value instanceof RubyNilClass;
-    }
-
     public static boolean isRubyRange(Object value) {
         return value instanceof RubyRange;
     }
@@ -107,6 +103,10 @@ public static boolean isForeignObject(Object object) {
         return (object instanceof TruffleObject) && !(object instanceof RubyBasicObject);
     }
 
+    public static boolean isNil(Object value) {
+        return value instanceof RubyNilClass;
+    }
+
     public static boolean isTrue(boolean value) {
         return value;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -227,7 +227,7 @@ public boolean isRubiniusUndefined(Object value) {
 
     // Helpers methods for terseness
 
-    protected RubyNilClass nil() {
+    protected RubyBasicObject nil() {
         return getContext().getCoreLibrary().getNilObject();
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
@@ -50,27 +50,27 @@ public ArrayCastNode(RubyContext context, SourceSection sourceSection, SplatCast
     protected abstract RubyNode getChild();
 
     @Specialization
-    public RubyNilClass cast(boolean value) {
+    public RubyBasicObject cast(boolean value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(int value) {
+    public RubyBasicObject cast(int value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(long value) {
+    public RubyBasicObject cast(long value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(double value) {
+    public RubyBasicObject cast(double value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(RubyBignum value) {
+    public RubyBasicObject cast(RubyBignum value) {
         return nil();
     }
 
@@ -79,8 +79,8 @@ public RubyArray cast(RubyArray array) {
         return array;
     }
 
-    @Specialization
-    public Object cast(RubyNilClass nil) {
+    @Specialization(guards = "isNil(nil)")
+    public Object cast(Object nil) {
         switch (nilBehavior) {
             case EMPTY_ARRAY:
                 return new RubyArray(getContext().getCoreLibrary().getArrayClass());
@@ -98,7 +98,7 @@ public Object cast(RubyNilClass nil) {
         }
     }
 
-    @Specialization(guards = {"!isRubyNilClass(object)", "!isRubyArray(object)"})
+    @Specialization(guards = {"!isNil(object)", "!isRubyArray(object)"})
     public Object cast(VirtualFrame frame, RubyBasicObject object) {
         final Object result = toArrayNode.call(frame, object, "to_ary", null, new Object[]{});
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java
@@ -34,8 +34,8 @@ public BooleanCastNode(BooleanCastNode copy) {
 
     public abstract boolean executeBoolean(VirtualFrame frame, Object value);
 
-    @Specialization
-    public boolean doNil(RubyNilClass nil) {
+    @Specialization(guards = "isNil(nil)")
+    public boolean doNil(Object nil) {
         return false;
     }
 
@@ -59,7 +59,7 @@ public boolean doFloat(double value) {
         return true;
     }
 
-    @Specialization(guards = "!isRubyNilClass(object)")
+    @Specialization(guards = "!isNil(object)")
     public boolean doBasicObject(RubyBasicObject object) {
         return true;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/CmpIntNode.java
@@ -86,8 +86,8 @@ public int cmpBignum(RubyBignum value, Object receiver, Object other) {
         return value.bigIntegerValue().signum();
     }
 
-    @Specialization
-    public int cmpNil(RubyNilClass value, Object receiver, Object other) {
+    @Specialization(guards = "isNil(nil)")
+    public int cmpNil(Object nil, Object receiver, Object other) {
         throw new RaiseException(
             getContext().getCoreLibrary().argumentError(
                 String.format("comparison of %s with %s failed",
@@ -100,7 +100,7 @@ public int cmpNil(RubyNilClass value, Object receiver, Object other) {
             "!isInteger(value)",
             "!isLong(value)",
             "!isRubyBignum(value)",
-            "!isRubyNilClass(value)" })
+            "!isNil(value)" })
     public int cmpObject(VirtualFrame frame, Object value, Object receiver, Object other) {
         if (gtNode == null) {
             CompilerDirectives.transferToInterpreter();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
@@ -41,27 +41,27 @@ public HashCastNode(RubyContext context, SourceSection sourceSection) {
     protected abstract RubyNode getChild();
 
     @Specialization
-    public RubyNilClass cast(boolean value) {
+    public RubyBasicObject cast(boolean value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(int value) {
+    public RubyBasicObject cast(int value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(long value) {
+    public RubyBasicObject cast(long value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(double value) {
+    public RubyBasicObject cast(double value) {
         return nil();
     }
 
     @Specialization
-    public RubyNilClass cast(RubyBignum value) {
+    public RubyBasicObject cast(RubyBignum value) {
         return nil();
     }
 
@@ -70,12 +70,12 @@ public RubyHash cast(RubyHash hash) {
         return hash;
     }
 
-    @Specialization
-    public RubyNilClass cast(RubyNilClass nil) {
-        return nil;
+    @Specialization(guards = "isNil(nil)")
+    public RubyBasicObject cast(Object nil) {
+        return nil();
     }
 
-    @Specialization(guards = {"!isRubyNilClass(object)", "!isRubyHash(object)"})
+    @Specialization(guards = {"!isNil(object)", "!isRubyHash(object)"})
     public Object cast(VirtualFrame frame, RubyBasicObject object) {
         final Object result = toHashNode.call(frame, object, "to_hash", null, new Object[]{});
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java
@@ -34,9 +34,9 @@ public ProcCastNode(RubyContext context, SourceSection sourceSection) {
         toProc = DispatchHeadNodeFactory.createMethodCall(context);
     }
 
-    @Specialization
-    public RubyNilClass doNil(RubyNilClass nil) {
-        return nil;
+    @Specialization(guards = "isNil(nil)")
+    public RubyBasicObject doNil(Object nil) {
+        return nil();
     }
 
     @Specialization

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
@@ -18,19 +18,15 @@
 import org.jruby.truffle.runtime.core.RubyNilClass;
 import org.jruby.truffle.runtime.core.RubyProc;
 
-/**
- * Wraps some node that will produce either a {@link RubyProc} or a {@link RubyNilClass} and
- * returns {@code null} in case of the latter. Used in parts of the dispatch chain.
- */
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ProcOrNullNode extends RubyNode {
 
     public ProcOrNullNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
     }
 
-    @Specialization
-    public Object doNil(RubyNilClass nil) {
+    @Specialization(guards = "isNil(nil)")
+    public Object doNil(Object nil) {
         return null;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/SingleValueCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/SingleValueCastNode.java
@@ -17,6 +17,7 @@
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyArray;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyNilClass;
 
 @NodeChild(value = "child", type = RubyNode.class)
@@ -29,7 +30,7 @@ public SingleValueCastNode(RubyContext context, SourceSection sourceSection) {
     public abstract Object executeSingleValue(VirtualFrame frame, Object[] args);
 
     @Specialization(guards = "noArguments(args)")
-    protected RubyNilClass castNil(Object[] args) {
+    protected RubyBasicObject castNil(Object[] args) {
         return nil();
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
@@ -60,8 +60,8 @@ public SplatCastNode(RubyContext context, SourceSection sourceSection, NilBehavi
 
     protected abstract RubyNode getChild();
 
-    @Specialization
-    public RubyArray splat(RubyNilClass nil) {
+    @Specialization(guards = "isNil(nil)")
+    public RubyArray splat(Object nil) {
         switch (nilBehavior) {
             case EMPTY_ARRAY:
                 return new RubyArray(getContext().getCoreLibrary().getArrayClass());
@@ -83,7 +83,7 @@ public RubyArray splat(VirtualFrame frame, RubyArray array) {
         return dup.executeDup(frame, array);
     }
 
-    @Specialization(guards = {"!isRubyNilClass(object)", "!isRubyArray(object)"})
+    @Specialization(guards = {"!isNil(object)", "!isRubyArray(object)"})
     public RubyArray splat(VirtualFrame frame, Object object) {
         final String method;
 
@@ -100,7 +100,7 @@ public RubyArray splat(VirtualFrame frame, Object object) {
 
             if (array instanceof RubyArray) {
                 return (RubyArray) array;
-            } else if (array instanceof RubyNilClass || array == DispatchNode.MISSING) {
+            } else if (array == nil() || array == DispatchNode.MISSING) {
                 CompilerDirectives.transferToInterpreter();
                 return RubyArray.fromObject(getContext().getCoreLibrary().getArrayClass(), object);
             } else {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
@@ -37,7 +37,7 @@ public static RubyNode sequence(RubyContext context, SourceSection sourceSection
     }
 
     public static RubyNode sequence(RubyContext context, SourceSection sourceSection, List<RubyNode> sequence) {
-        final List<RubyNode> flattened = flatten(sequence, true);
+        final List<RubyNode> flattened = flatten(context, sequence, true);
 
         if (flattened.isEmpty()) {
             return new DefinedWrapperNode(context, sourceSection,
@@ -50,19 +50,19 @@ public static RubyNode sequence(RubyContext context, SourceSection sourceSection
         }
     }
 
-    private static List<RubyNode> flatten(List<RubyNode> sequence, boolean allowTrailingNil) {
+    private static List<RubyNode> flatten(RubyContext context, List<RubyNode> sequence, boolean allowTrailingNil) {
         final List<RubyNode> flattened = new ArrayList<>();
 
         for (int n = 0; n < sequence.size(); n++) {
             final boolean lastNode = n == sequence.size() - 1;
             final RubyNode node = sequence.get(n);
 
-            if (node instanceof ObjectLiteralNode && ((ObjectLiteralNode) node).getObject() instanceof RubyNilClass) {
+            if (node instanceof ObjectLiteralNode && ((ObjectLiteralNode) node).getObject() == context.getCoreLibrary().getNilObject()) {
                 if (allowTrailingNil && lastNode) {
                     flattened.add(node);
                 }
             } else if (node instanceof SequenceNode) {
-                flattened.addAll(flatten(Arrays.asList(((SequenceNode) node).body), lastNode));
+                flattened.addAll(flatten(context, Arrays.asList(((SequenceNode) node).body), lastNode));
             } else {
                 flattened.add(node);
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
@@ -159,7 +159,7 @@ public InitializeNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public RubyNilClass initialize() {
+        public RubyBasicObject initialize() {
             return nil();
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ClassNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ClassNodes.java
@@ -127,7 +127,7 @@ public InheritedNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public RubyNilClass inherited(Object subclass) {
+        public RubyBasicObject inherited(Object subclass) {
             return nil();
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingConverterNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingConverterNodes.java
@@ -26,6 +26,7 @@
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyEncodingConverter;
 import org.jruby.truffle.runtime.core.RubyNilClass;
 import org.jruby.util.ByteList;
@@ -44,7 +45,7 @@ public InitializeNode(RubyContext context, SourceSection sourceSection) {
 
         @TruffleBoundary
         @Specialization
-        public RubyNilClass initialize(RubyEncodingConverter self, Object source, Object destination, Object options) {
+        public RubyBasicObject initialize(RubyEncodingConverter self, Object source, Object destination, Object options) {
             // Adapted from RubyConverter - see attribution there
 
             Ruby runtime = getContext().getRuntime();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
@@ -203,12 +203,12 @@ public RubyEncoding defaultExternal(RubyString encodingString) {
             return rubyEncoding;
         }
 
-        @Specialization
-        public RubyEncoding defaultExternal(RubyNilClass nil) {
+        @Specialization(guards = "isNil(nil)")
+        public RubyEncoding defaultExternal(Object nil) {
             throw new RaiseException(getContext().getCoreLibrary().argumentError("default external can not be nil", this));
         }
 
-        @Specialization(guards = { "!isRubyEncoding(encoding)", "!isRubyString(encoding)", "!isRubyNilClass(encoding)" })
+        @Specialization(guards = { "!isRubyEncoding(encoding)", "!isRubyString(encoding)", "!isNil(encoding)" })
         public RubyEncoding defaultExternal(VirtualFrame frame, Object encoding) {
             if (toStrNode == null) {
                 CompilerDirectives.transferToInterpreter();
@@ -239,16 +239,16 @@ public RubyEncoding defaultInternal(RubyEncoding encoding) {
             return encoding;
         }
 
-        @Specialization
-        public RubyNilClass defaultInternal(RubyNilClass encoding) {
+        @Specialization(guards = "isNil(encoding)")
+        public RubyBasicObject defaultInternal(Object encoding) {
             CompilerDirectives.transferToInterpreter();
 
             getContext().getRuntime().setDefaultInternalEncoding(null);
 
-            return encoding;
+            return nil();
         }
 
-        @Specialization(guards = { "!isRubyEncoding(encoding)", "!isRubyNilClass(encoding)" })
+        @Specialization(guards = { "!isRubyEncoding(encoding)", "!isNil(encoding)" })
         public RubyString defaultInternal(VirtualFrame frame, Object encoding) {
             CompilerDirectives.transferToInterpreter();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
@@ -16,6 +16,7 @@
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.UndefinedPlaceholder;
 import org.jruby.truffle.runtime.backtrace.Backtrace;
+import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyException;
 import org.jruby.truffle.runtime.core.RubyNilClass;
 import org.jruby.truffle.runtime.core.RubyString;
@@ -31,15 +32,15 @@ public InitializeNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public RubyNilClass initialize(RubyException exception, UndefinedPlaceholder message) {
+        public RubyBasicObject initialize(RubyException exception, UndefinedPlaceholder message) {
             CompilerDirectives.transferToInterpreter();
 
             exception.initialize(getContext().makeString(""));
             return nil();
         }
 
         @Specialization
-        public RubyNilClass initialize(RubyException exception, RubyString message) {
+        public RubyBasicObject initialize(RubyException exception, RubyString message) {
             CompilerDirectives.transferToInterpreter();
 
             exception.initialize(message);
@@ -75,12 +76,12 @@ public CaptureBacktraceNode(RubyContext context, SourceSection sourceSection) {
         }
 
         @Specialization
-        public RubyNilClass captureBacktrace(RubyException exception, UndefinedPlaceholder offset) {
+        public RubyBasicObject captureBacktrace(RubyException exception, UndefinedPlaceholder offset) {
             return captureBacktrace(exception, 1);
         }
 
         @Specialization
-        public RubyNilClass captureBacktrace(RubyException exception, int offset) {
+        public RubyBasicObject captureBacktrace(RubyException exception, int offset) {
             Backtrace backtrace = RubyCallStack.getBacktrace(this, offset);
             exception.setBacktrace(backtrace);
             return nil();