jruby · Mar 14, 2015 · Mar 14, 2015
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java
@@ -81,7 +81,7 @@ public Object isDefined(VirtualFrame frame) {
              */
 
             if (e.getRubyException().getLogicalClass() == context.getCoreLibrary().getNameErrorClass()) {
-                return getContext().getCoreLibrary().getNilObject();
+                return nil();
             }
 
             throw e;
@@ -91,7 +91,7 @@ public Object isDefined(VirtualFrame frame) {
         RubyConstant constant = ModuleOperations.lookupConstant(context, dispatch.getLexicalScope(), module, name);
 
         if (constant == null || !constant.isVisibleTo(context, dispatch.getLexicalScope(), module)) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         } else {
             return context.makeString("constant");
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
@@ -169,13 +169,13 @@ private Object[] splat(Object argument) {
     public Object isDefined(VirtualFrame frame) {
         notDesignedForCompilation();
 
-        if (receiver.isDefined(frame) == getContext().getCoreLibrary().getNilObject()) {
-            return getContext().getCoreLibrary().getNilObject();
+        if (receiver.isDefined(frame) == nil()) {
+            return nil();
         }
 
         for (RubyNode argument : arguments) {
-            if (argument.isDefined(frame) == getContext().getCoreLibrary().getNilObject()) {
-                return getContext().getCoreLibrary().getNilObject();
+            if (argument.isDefined(frame) == nil()) {
+                return nil();
             }
         }
 
@@ -193,7 +193,7 @@ public Object isDefined(VirtualFrame frame) {
 
             receiverObject = receiver.execute(frame);
         } catch (Exception e) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         }
 
         // TODO(CS): this lookup should be cached
@@ -206,12 +206,12 @@ public Object isDefined(VirtualFrame frame) {
             final Object r = respondToMissing.call(frame, receiverObject, "respond_to_missing?", null, context.makeString(methodName));
 
             if (r != DispatchNode.MISSING && !respondToMissingCast.executeBoolean(frame, r)) {
-                return getContext().getCoreLibrary().getNilObject();
+                return nil();
             }
         } else if (method.isUndefined()) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         } else if (!ignoreVisibility && !method.isVisibleTo(this, context.getCoreLibrary().getMetaClass(self))) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         }
 
         return context.makeString("method");

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -10,6 +10,7 @@
 package org.jruby.truffle.nodes;
 
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -217,7 +218,7 @@ public RubyContext getContext() {
     }
 
     public static void notDesignedForCompilation() {
-        CompilerAsserts.neverPartOfCompilation();
+        CompilerDirectives.bailout("this code either doesn't implement Ruby semantics properly, or is a basic implementation that will not compile");
     }
 
     public boolean isTrue(boolean value) {
@@ -464,7 +465,7 @@ public boolean isObjectArray(Object value) {
     }
 
     public boolean isRubyNilObject(Object value) {
-        return value == getContext().getCoreLibrary().getNilObject();
+        return value == nil();
     }
 
     public boolean isRubiniusUndefined(Object value) {
@@ -493,4 +494,8 @@ protected Object ruby(VirtualFrame frame, String expression, Object... arguments
         return getContext().eval(ByteList.create(expression), binding, true, "inline-ruby", this);
     }
 
+    protected RubyNilClass nil() {
+        return getContext().getCoreLibrary().getNilObject();
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/TopLevelRaiseHandler.java b/truffle/src/main/java/org/jruby/truffle/nodes/TopLevelRaiseHandler.java
@@ -40,7 +40,7 @@ public Object execute(VirtualFrame frame) {
             // Ignore
         }
 
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadNormalizedNode.java
@@ -45,7 +45,7 @@ public ArrayReadNormalizedNode(ArrayReadNormalizedNode prev) {
             guards="isNullArray"
     )
     public RubyNilClass readNull(RubyArray array, int index) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     // Read within the bounds of an array with actual storage
@@ -84,7 +84,7 @@ public Object readObjectInBounds(RubyArray array, int index) {
             guards="!isInBounds"
     )
     public RubyNilClass readOutOfBounds(RubyArray array, int index) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     // Guards

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadSliceNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayReadSliceNormalizedNode.java
@@ -47,14 +47,14 @@ public ArrayReadSliceNormalizedNode(ArrayReadSliceNormalizedNode prev) {
             guards={"!indexInBounds"}
     )
     public RubyNilClass readIndexOutOfBounds(RubyArray array, int index, int length) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization(
             guards={"!lengthPositive"}
     )
     public RubyNilClass readNegativeLength(RubyArray array, int index, int length) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     // If these guards pass for a null array you can only get an empty array

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/array/ArrayWriteNormalizedNode.java
@@ -101,7 +101,7 @@ public Object writeNullBeyond(RubyArray array, int index, Object value) {
         final Object[] store = new Object[index + 1];
 
         for (int n = 0; n < index; n++) {
-            store[n] = getContext().getCoreLibrary().getNilObject();
+            store[n] = nil();
         }
 
         store[index] = value;
@@ -284,7 +284,7 @@ public Object writeBeyondPrimitive(VirtualFrame frame, RubyArray array, int inde
         final Object[] objectStore = ((Object[]) array.getStore());
 
         for (int n = array.getSize(); n < index; n++) {
-            objectStore[n] = getContext().getCoreLibrary().getNilObject();
+            objectStore[n] = nil();
         }
 
         objectStore[index] = value;
@@ -300,7 +300,7 @@ public Object writeBeyondObject(VirtualFrame frame, RubyArray array, int index,
         final Object[] objectStore = ((Object[]) array.getStore());
 
         for (int n = array.getSize(); n < index; n++) {
-            objectStore[n] = getContext().getCoreLibrary().getNilObject();
+            objectStore[n] = nil();
         }
 
         objectStore[index] = value;

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
@@ -54,27 +54,27 @@ public ArrayCastNode(ArrayCastNode prev) {
 
     @Specialization
     public RubyNilClass cast(boolean value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(int value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(long value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(double value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(RubyBignum value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
@@ -89,7 +89,7 @@ public Object cast(RubyNilClass nil) {
                 return new RubyArray(getContext().getCoreLibrary().getArrayClass());
 
             case ARRAY_WITH_NIL:
-                return RubyArray.fromObject(getContext().getCoreLibrary().getArrayClass(), getContext().getCoreLibrary().getNilObject());
+                return RubyArray.fromObject(getContext().getCoreLibrary().getArrayClass(), nil());
 
             case NIL:
                 return nil;
@@ -108,7 +108,7 @@ public Object cast(VirtualFrame frame, RubyBasicObject object) {
         final Object result = toArrayNode.call(frame, object, "to_ary", null, new Object[]{});
 
         if (result == DispatchNode.MISSING) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         }
 
         if (!(result instanceof RubyArray)) {

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
@@ -44,27 +44,27 @@ public HashCastNode(HashCastNode prev) {
 
     @Specialization
     public RubyNilClass cast(boolean value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(int value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(long value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(double value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
     public RubyNilClass cast(RubyBignum value) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization
@@ -84,7 +84,7 @@ public Object cast(VirtualFrame frame, RubyBasicObject object) {
         final Object result = toHashNode.call(frame, object, "to_hash", null, new Object[]{});
 
         if (result == DispatchNode.MISSING) {
-            return getContext().getCoreLibrary().getNilObject();
+            return nil();
         }
 
         if (!(result instanceof RubyHash)) {

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
@@ -33,7 +33,7 @@ public SingleValueCastNode(SingleValueCastNode prev) {
 
     @Specialization(guards = "noArguments")
     protected RubyNilClass castNil(Object[] args) {
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     @Specialization(guards = "singleArgument")

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
@@ -73,7 +73,7 @@ public RubyArray splat(RubyNilClass nil) {
                 return new RubyArray(getContext().getCoreLibrary().getArrayClass());
 
             case ARRAY_WITH_NIL:
-                return RubyArray.fromObject(getContext().getCoreLibrary().getArrayClass(), getContext().getCoreLibrary().getNilObject());
+                return RubyArray.fromObject(getContext().getCoreLibrary().getArrayClass(), nil());
 
             default: {
                 CompilerAsserts.neverPartOfCompilation();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/cast/TaintResultNode.java
@@ -74,7 +74,7 @@ public Object execute(VirtualFrame frame) {
             throw new UnsupportedOperationException(e);
         }
 
-        if (result != getContext().getCoreLibrary().getNilObject()) {
+        if (result != nil()) {
             if (taintFromSelf) {
                 maybeTaint((RubyBasicObject) RubyArguments.getSelf(frame.getArguments()), result);
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
@@ -54,7 +54,7 @@ public Object execute(VirtualFrame frame) {
             return e.getResult();
         }
 
-        return getContext().getCoreLibrary().getNilObject();
+        return nil();
     }
 
     private static abstract class WhileRepeatingBaseNode extends Node implements RepeatingNode {