[Truffle] Fix nil.object_id.

jruby · Sep 23, 2015 · 9896af7 · 9896af7
1 parent 25e9cbe
commit 9896af7
Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/truffle/pe/core/objectid_pe.rb b/test/truffle/pe/core/objectid_pe.rb
@@ -6,7 +6,7 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-tagged_example "nil.object_id"
+example "nil.object_id"
 
 example "true.object_id"
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ObjectPrimitiveNodes.java
@@ -83,7 +83,7 @@ public Object objectID(double value) {
             return ObjectIDOperations.floatToID(getContext(), value);
         }
 
-        @Specialization
+        @Specialization(guards = "!isNil(object)")
         public long objectID(DynamicObject object,
                 @Cached("createReadObjectIDNode()") ReadHeadObjectFieldNode readObjectIdNode,
                 @Cached("createWriteObjectIDNode()") WriteHeadObjectFieldNode writeObjectIdNode) {