--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java	Fri Apr 04 16:10:15 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java	Mon Apr 07 11:46:20 2014 +0200
@@ -265,22 +265,22 @@
     }
 
     public AbstractAddress asByteAddr(Value value) {
-        assert value.getKind() == Kind.Byte || value.getKind() == Kind.Boolean;
+        assert value.getKind().getByteCount() >= Kind.Byte.getByteCount();
         return asAddress(value);
     }
 
     public AbstractAddress asShortAddr(Value value) {
-        assert value.getKind() == Kind.Short || value.getKind() == Kind.Char;
+        assert value.getKind().getByteCount() >= Kind.Short.getByteCount();
         return asAddress(value);
     }
 
     public AbstractAddress asIntAddr(Value value) {
-        assert value.getKind() == Kind.Int;
+        assert value.getKind().getByteCount() >= Kind.Int.getByteCount();
         return asAddress(value);
     }
 
     public AbstractAddress asLongAddr(Value value) {
-        assert value.getKind() == Kind.Long;
+        assert value.getKind().getByteCount() >= Kind.Long.getByteCount();
         return asAddress(value);
     }
 
@@ -290,12 +290,12 @@
     }
 
     public AbstractAddress asFloatAddr(Value value) {
-        assert value.getKind() == Kind.Float;
+        assert value.getKind().getByteCount() >= Kind.Float.getByteCount();
         return asAddress(value);
     }
 
     public AbstractAddress asDoubleAddr(Value value) {
-        assert value.getKind() == Kind.Double;
+        assert value.getKind().getByteCount() >= Kind.Double.getByteCount();
         return asAddress(value);
     }