[Truffle] Simplified and consolidated a nil object guard.

jruby · Nov 24, 2014 · 89bdf82 · 89bdf82
1 parent d5a78a4
commit 89bdf82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -222,4 +222,7 @@ public static void notDesignedForCompilation() {
         CompilerAsserts.neverPartOfCompilation();
     }
 
+    public static boolean isNil(RubyObject o) {
+        return o instanceof RubyNilClass;
+    }
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java
@@ -55,14 +55,11 @@ public boolean or(RubyNilClass other) {
             return false;
         }
 
-        @Specialization(guards = "isNotNil")
+        @Specialization(guards = "!isNil")
         public boolean or(RubyObject other) {
             return true;
         }
 
-        static boolean isNotNil(RubyObject o) {
-            return ! (o instanceof RubyNilClass);
-        }
     }
 
     @CoreMethod(names = "^", needsSelf = false, required = 1)
@@ -86,15 +83,11 @@ public boolean xor(RubyNilClass other) {
             return false;
         }
 
-        @Specialization(guards = "isNotNil")
+        @Specialization(guards = "!isNil")
         public boolean xor(RubyObject other) {
             return true;
         }
 
-        static boolean isNotNil(RubyObject o) {
-            return ! (o instanceof RubyNilClass);
-        }
-
     }
 
     @CoreMethod(names = {"to_s", "inspect"}, needsSelf = false)

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java
@@ -38,14 +38,10 @@ public boolean and(RubyNilClass other) {
             return false;
         }
 
-        @Specialization(guards = "isNotNil")
+        @Specialization(guards = "!isNil")
         public boolean and(RubyObject other) {
             return true;
         }
-
-        static boolean isNotNil(RubyObject o) {
-            return ! (o instanceof RubyNilClass);
-        }
     }
 
     @CoreMethod(names = "|", needsSelf = false, required = 1)