[Truffle] Return nil when reading a missing object field.

* Propagating null accross the tree usually proves being a bad idea.
jruby · May 15, 2015 · 851477a · 851477a
1 parent 83dbfee
commit 851477a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
@@ -28,7 +28,6 @@ public class ReadInstanceVariableNode extends RubyNode implements ReadNode {
     @Child private ReadHeadObjectFieldNode readNode;
     private final boolean isGlobal;
 
-    private final BranchProfile nullProfile = BranchProfile.create();
     private final BranchProfile primitiveProfile = BranchProfile.create();
 
     public ReadInstanceVariableNode(RubyContext context, SourceSection sourceSection, String name, RubyNode receiver, boolean isGlobal) {
@@ -85,14 +84,7 @@ public Object execute(VirtualFrame frame) {
         final Object receiverObject = receiver.execute(frame);
 
         if (receiverObject instanceof RubyBasicObject) {
-            Object value = readNode.execute((RubyBasicObject) receiverObject);
-
-            if (value == null) {
-                nullProfile.enter();
-                value = nil();
-            }
-
-            return value;
+            return readNode.execute((RubyBasicObject) receiverObject);
         } else {
             primitiveProfile.enter();
             return nil();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadMissingObjectFieldNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objectstorage/ReadMissingObjectFieldNode.java
@@ -32,7 +32,7 @@ public Object execute(RubyBasicObject object) {
         }
 
         if (object.getDynamicObject().getShape() == objectLayout) {
-            return null;
+            return object.getContext().getCoreLibrary().getNilObject();
         } else {
             return next.execute(object);
         }