--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Thu Oct 16 10:06:27 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Thu Oct 16 10:21:29 2014 +0200
@@ -272,10 +272,19 @@
      */
     public static Constant forPrimitiveInt(int bits, long i) {
         assert bits <= 64;
-        if (bits > 32) {
-            return new PrimitiveConstant(Kind.Long, i);
-        } else {
-            return new PrimitiveConstant(Kind.Int, (int) i);
+        switch (bits) {
+            case 1:
+                return forBoolean(i != 0);
+            case 8:
+                return forByte((byte) i);
+            case 16:
+                return forShort((short) i);
+            case 32:
+                return forInt((int) i);
+            case 64:
+                return forLong(i);
+            default:
+                throw new IllegalArgumentException("unsupported integer width: " + bits);
         }
     }