diff -r e701af23a095 -r 9851071b551a src/share/classes/com/sun/tools/javac/code/Type.java
--- a/src/share/classes/com/sun/tools/javac/code/Type.java	Tue Jun 18 18:57:52 2013 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Tue Jun 18 19:02:48 2013 +0100
@@ -110,49 +110,27 @@
     }
 
     public boolean isNumeric() {
-        switch (tag) {
-            case BYTE: case CHAR:
-            case SHORT:
-            case INT: case LONG:
-            case FLOAT: case DOUBLE:
-                return true;
-            default:
-                return false;
-        }
+        return tag.isNumeric;
     }
 
     public boolean isPrimitive() {
-        return (isNumeric() || tag == BOOLEAN);
+        return tag.isPrimitive;
     }
 
     public boolean isPrimitiveOrVoid() {
-        return (isPrimitive() || tag == VOID);
+        return tag.isPrimitiveOrVoid;
     }
 
     public boolean isReference() {
-        switch (tag) {
-        case CLASS:
-        case ARRAY:
-        case TYPEVAR:
-        case WILDCARD:
-        case ERROR:
-            return true;
-        default:
-            return false;
-        }
+        return tag.isReference;
     }
 
     public boolean isNullOrReference() {
-        return (tag == BOT || isReference());
+        return (tag.isReference || tag == BOT);
     }
 
     public boolean isPartial() {
-        switch(tag) {
-            case ERROR: case UNKNOWN: case UNDETVAR:
-                return true;
-            default:
-                return false;
-        }
+        return tag.isPartial;
     }
 
     /**