Tidy up guards

oracle · Jun 14, 2018 · f7e3751 · f7e3751
1 parent 2895c91
commit f7e3751
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/org/truffleruby/interop/InteropNodes.java b/src/main/java/org/truffleruby/interop/InteropNodes.java
@@ -837,7 +837,6 @@ public abstract static class InteropJavaInstanceOfNode extends CoreMethodArrayAr
 
         @Specialization(guards = {
                 "isJavaObject(boxedInstance)",
-                "isJavaObject(boxedJavaClass)",
                 "isJavaClassOrInterface(boxedJavaClass)"
         })
         public boolean javaInstanceOfJava(Object boxedInstance, TruffleObject boxedJavaClass) {
@@ -848,7 +847,6 @@ public boolean javaInstanceOfJava(Object boxedInstance, TruffleObject boxedJavaC
 
         @Specialization(guards = {
                 "!isJavaObject(instance)",
-                "isJavaObject(boxedJavaClass)",
                 "isJavaClassOrInterface(boxedJavaClass)"
         })
         public boolean javaInstanceOfNotJava(Object instance, TruffleObject boxedJavaClass) {
@@ -861,7 +859,8 @@ protected boolean isJavaObject(Object object) {
         }
 
         protected boolean isJavaClassOrInterface(TruffleObject object) {
-            return getContext().getEnv().asHostObject(object) instanceof Class<?>;
+            return getContext().getEnv().isHostObject(object)
+                && getContext().getEnv().asHostObject(object) instanceof Class<?>;
         }
 
     }