[Truffle] Simplify guards.

jruby · Aug 17, 2015 · 7032f34 · 7032f34
1 parent 443ebfb
commit 7032f34
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 40 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyGuards.java
@@ -45,7 +45,7 @@ public static boolean isRubyBasicObject(Object object) {
     }
 
     public static boolean isRubyBignum(Object value) {
-        return (value instanceof DynamicObject) && isRubyBignum((DynamicObject) value);
+        return Layouts.BIGNUM.isBignum(value);
     }
 
     public static boolean isRubyBignum(DynamicObject value) {
@@ -57,23 +57,23 @@ public static boolean isRubyBigDecimal(DynamicObject value) {
     }
 
     public static boolean isIntegerFixnumRange(Object object) {
-        return (object instanceof DynamicObject) && isIntegerFixnumRange((DynamicObject) object);
+        return Layouts.INTEGER_FIXNUM_RANGE.isIntegerFixnumRange(object);
     }
 
     public static boolean isIntegerFixnumRange(DynamicObject object) {
         return Layouts.INTEGER_FIXNUM_RANGE.isIntegerFixnumRange(object);
     }
 
     public static boolean isLongFixnumRange(Object object) {
-        return (object instanceof DynamicObject) && isLongFixnumRange((DynamicObject) object);
+        return Layouts.LONG_FIXNUM_RANGE.isLongFixnumRange(object);
     }
 
     public static boolean isLongFixnumRange(DynamicObject object) {
         return Layouts.LONG_FIXNUM_RANGE.isLongFixnumRange(object);
     }
 
     public static boolean isObjectRange(Object object) {
-        return (object instanceof DynamicObject) && isObjectRange((DynamicObject) object);
+        return Layouts.OBJECT_RANGE.isObjectRange(object);
     }
 
     public static boolean isObjectRange(DynamicObject object) {
@@ -85,7 +85,7 @@ public static boolean isRubyRange(Object value) {
     }
 
     public static boolean isRubyArray(Object value) {
-        return (value instanceof DynamicObject) && isRubyArray((DynamicObject) value);
+        return Layouts.ARRAY.isArray(value);
     }
 
     public static boolean isRubyArray(DynamicObject value) {
@@ -97,103 +97,91 @@ public static boolean isRubyBinding(DynamicObject object) {
     }
 
     public static boolean isRubyClass(Object value) {
-        return (value instanceof DynamicObject) && isRubyClass((DynamicObject) value);
+        return Layouts.CLASS.isClass(value);
     }
 
     public static boolean isRubyClass(DynamicObject value) {
         return Layouts.CLASS.isClass(value);
     }
 
     public static boolean isRubyHash(Object value) {
-        return (value instanceof DynamicObject) && isRubyHash((DynamicObject) value);
+        return Layouts.HASH.isHash(value);
     }
 
     public static boolean isRubyHash(DynamicObject value) {
         return Layouts.HASH.isHash(value);
     }
 
     public static boolean isRubyModule(Object value) {
-        return (value instanceof DynamicObject) && isRubyModule((DynamicObject) value);
+        return Layouts.MODULE.isModule(value);
     }
 
     public static boolean isRubyModule(DynamicObject value) {
         return Layouts.MODULE.isModule(value);
     }
 
     public static boolean isRubyRegexp(Object value) {
-        return (value instanceof DynamicObject) && isRubyRegexp((DynamicObject) value);
+        return Layouts.REGEXP.isRegexp(value);
     }
 
     public static boolean isRubyRegexp(DynamicObject value) {
         return Layouts.REGEXP.isRegexp(value);
     }
 
     public static boolean isRubyString(Object value) {
-        return (value instanceof DynamicObject) && isRubyString((DynamicObject) value);
+        return Layouts.STRING.isString(value);
     }
 
     public static boolean isRubyString(DynamicObject value) {
         return Layouts.STRING.isString(value);
     }
 
     public static boolean isRubyEncoding(Object object) {
-        return (object instanceof DynamicObject) && isRubyEncoding((DynamicObject) object);
+        return Layouts.ENCODING.isEncoding(object);
     }
 
     public static boolean isRubyEncoding(DynamicObject object) {
         return Layouts.ENCODING.isEncoding(object);
     }
 
     public static boolean isRubySymbol(Object value) {
-        return (value instanceof DynamicObject) && isRubySymbol((DynamicObject) value);
+        return Layouts.SYMBOL.isSymbol(value);
     }
 
     public static boolean isRubySymbol(DynamicObject value) {
         return Layouts.SYMBOL.isSymbol(value);
     }
 
     public static boolean isRubyMethod(Object value) {
-        return (value instanceof DynamicObject) && isRubyMethod((DynamicObject) value);
+        return Layouts.METHOD.isMethod(value);
     }
 
     public static boolean isRubyMethod(DynamicObject value) {
         return Layouts.METHOD.isMethod(value);
     }
 
     public static boolean isRubyUnboundMethod(Object value) {
-        return (value instanceof DynamicObject) && isRubyUnboundMethod((DynamicObject) value);
+        return Layouts.UNBOUND_METHOD.isUnboundMethod(value);
     }
 
     public static boolean isRubyUnboundMethod(DynamicObject value) {
         return Layouts.UNBOUND_METHOD.isUnboundMethod(value);
     }
 
-    public static boolean isRubyMutex(DynamicObject value) {
-        return Layouts.MUTEX.isMutex(value);
-    }
-
     public static boolean isDynamicObject(Object value) {
         return value instanceof DynamicObject;
     }
 
-    public static boolean isRubyPointer(Object value) {
-        return (value instanceof DynamicObject) && isRubyPointer((DynamicObject) value);
-    }
-
     public static boolean isRubyPointer(DynamicObject value) {
         return Layouts.POINTER.isPointer(value);
     }
 
-    public static boolean isRubiniusByteArray(Object value) {
-        return (value instanceof DynamicObject) && isRubiniusByteArray((DynamicObject) value);
-    }
-
     public static boolean isRubiniusByteArray(DynamicObject value) {
         return Layouts.BYTE_ARRAY.isByteArray(value);
     }
 
     public static boolean isRubyProc(Object object) {
-        return (object instanceof DynamicObject) && isRubyProc((DynamicObject) object);
+        return Layouts.PROC.isProc(object);
     }
 
     public static boolean isRubyProc(DynamicObject object) {
@@ -208,32 +196,20 @@ public static boolean isRubyTime(DynamicObject object) {
         return Layouts.TIME.isTime(object);
     }
 
-    public static boolean isRubyException(Object value) {
-        return (value instanceof DynamicObject) && isRubyException((DynamicObject) value);
-    }
-
     public static boolean isRubyException(DynamicObject object) {
         return Layouts.EXCEPTION.isException(object);
     }
 
-    public static boolean isRubyFiber(Object object) {
-        return (object instanceof DynamicObject) && isRubyFiber((DynamicObject) object);
-    }
-
     public static boolean isRubyFiber(DynamicObject object) {
         return Layouts.FIBER.isFiber(object);
     }
 
-    public static boolean isRubyThread(Object object) {
-        return (object instanceof DynamicObject) && isRubyThread((DynamicObject) object);
-    }
-
     public static boolean isRubyThread(DynamicObject object) {
         return ThreadLayoutImpl.INSTANCE.isThread(object);
     }
 
     public static boolean isRubyMatchData(Object object) {
-        return (object instanceof DynamicObject) && isRubyMatchData((DynamicObject) object);
+        return Layouts.MATCH_DATA.isMatchData(object);
     }
 
     public static boolean isRubyMatchData(DynamicObject object) {

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ArrayLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ArrayLayout.java
@@ -27,6 +27,7 @@ DynamicObject createArray(DynamicObjectFactory factory,
 
     boolean isArray(ObjectType objectType);
     boolean isArray(DynamicObject object);
+    boolean isArray(Object object);
 
     Object getStore(DynamicObject object);
     void setStore(DynamicObject object, Object value);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/BignumLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/BignumLayout.java
@@ -24,6 +24,7 @@ DynamicObjectFactory createBignumShape(DynamicObject logicalClass,
     DynamicObject createBignum(DynamicObjectFactory factory,
                                BigInteger value);
 
+    boolean isBignum(Object object);
     boolean isBignum(DynamicObject object);
 
     BigInteger getValue(DynamicObject object);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ClassLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ClassLayout.java
@@ -29,6 +29,7 @@ DynamicObject createClass(DynamicObjectFactory factory,
                               @Nullable DynamicObjectFactory instanceFactory);
 
     boolean isClass(DynamicObject object);
+    boolean isClass(Object object);
 
     boolean getIsSingleton(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/EncodingLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/EncodingLayout.java
@@ -27,6 +27,7 @@ DynamicObject createEncoding(DynamicObjectFactory factory,
                                  boolean dummy);
 
     boolean isEncoding(DynamicObject object);
+    boolean isEncoding(Object object);
 
     Encoding getEncoding(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/HashLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/HashLayout.java
@@ -34,6 +34,7 @@ DynamicObject createHash(
 
     boolean isHash(ObjectType objectType);
     boolean isHash(DynamicObject object);
+    boolean isHash(Object object);
 
     DynamicObject getDefaultBlock(DynamicObject object);
     void setDefaultBlock(DynamicObject object, DynamicObject value);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/IntegerFixnumRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/IntegerFixnumRangeLayout.java
@@ -24,6 +24,7 @@ DynamicObject createIntegerFixnumRange(DynamicObjectFactory factory,
                                            int begin,
                                            int end);
 
+    boolean isIntegerFixnumRange(Object object);
     boolean isIntegerFixnumRange(DynamicObject object);
 
     boolean getExcludedEnd(DynamicObject object);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/LongFixnumRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/LongFixnumRangeLayout.java
@@ -24,6 +24,7 @@ DynamicObject createLongFixnumRange(DynamicObjectFactory factory,
                                         long begin,
                                         long end);
 
+    boolean isLongFixnumRange(Object object);
     boolean isLongFixnumRange(DynamicObject object);
 
     boolean getExcludedEnd(DynamicObject object);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/MatchDataLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/MatchDataLayout.java
@@ -24,6 +24,7 @@ DynamicObject createMatchData(DynamicObjectFactory factory,
                                   MatchDataNodes.MatchDataFields fields);
 
     boolean isMatchData(DynamicObject object);
+    boolean isMatchData(Object object);
 
     MatchDataNodes.MatchDataFields getFields(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/MethodLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/MethodLayout.java
@@ -24,6 +24,7 @@ DynamicObject createMethod(DynamicObjectFactory factory,
                                InternalMethod method);
 
     boolean isMethod(DynamicObject object);
+    boolean isMethod(Object object);
 
     Object getReceiver(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ModuleLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ModuleLayout.java
@@ -24,6 +24,7 @@ DynamicObject createModule(DynamicObjectFactory factory,
                                ModuleFields fields);
 
     boolean isModule(DynamicObject object);
+    boolean isModule(Object object);
 
     ModuleFields getFields(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ObjectRangeLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ObjectRangeLayout.java
@@ -25,6 +25,7 @@ DynamicObject createObjectRange(DynamicObjectFactory factory,
                                     @Nullable Object begin,
                                     @Nullable Object end);
 
+    boolean isObjectRange(Object object);
     boolean isObjectRange(DynamicObject object);
 
     boolean getExcludedEnd(DynamicObject object);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ProcLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/ProcLayout.java
@@ -38,6 +38,7 @@ DynamicObject createProc(
             @Nullable DynamicObject block);
 
     boolean isProc(DynamicObject object);
+    boolean isProc(Object object);
 
     ProcNodes.Type getType(DynamicObject object);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/RegexpLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/RegexpLayout.java
@@ -30,6 +30,7 @@ DynamicObject createRegexp(DynamicObjectFactory factory,
                                @Nullable Object cachedNames);
 
     boolean isRegexp(DynamicObject object);
+    boolean isRegexp(Object object);
 
     Regex getRegex(DynamicObject object);
     void setRegex(DynamicObject object, Regex value);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/StringLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/StringLayout.java
@@ -30,6 +30,7 @@ DynamicObject createString(DynamicObjectFactory factory,
 
     boolean isString(ObjectType objectType);
     boolean isString(DynamicObject dynamicObject);
+    boolean isString(Object dynamicObject);
 
     ByteList getByteList(DynamicObject object);
     void setByteList(DynamicObject object, ByteList byteList);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/SymbolLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/SymbolLayout.java
@@ -28,6 +28,7 @@ DynamicObject createSymbol(DynamicObjectFactory factory,
                                int codeRange,
                                @Nullable SymbolCodeRangeableWrapper codeRangeableWrapper);
 
+    boolean isSymbol(Object object);
     boolean isSymbol(DynamicObject object);
 
     String getString(DynamicObject object);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/layouts/UnboundMethodLayout.java b/truffle/src/main/java/org/jruby/truffle/runtime/layouts/UnboundMethodLayout.java
@@ -25,6 +25,7 @@ DynamicObject createUnboundMethod(DynamicObjectFactory factory,
                                       InternalMethod method);
 
     boolean isUnboundMethod(DynamicObject object);
+    boolean isUnboundMethod(Object object);
 
     DynamicObject getOrigin(DynamicObject object);