# HG changeset patch # User Thomas Wuerthinger # Date 1332328342 -3600 # Node ID 4bcd22f088b2b53adcf284b1c8ec391196ea368a # Parent 4eb9895d9afe45440bfe1e98c7121953948e01c6 Use CiKind.ordinal() as it directly reflects HotSpot's basic type value. diff -r 4eb9895d9afe -r 4bcd22f088b2 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Wed Mar 21 12:07:41 2012 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java Wed Mar 21 12:12:22 2012 +0100 @@ -113,30 +113,6 @@ } public int getArrayOffset(CiKind kind) { - return arrayOffsets[getKindNumber(kind)]; - } - - private static int getKindNumber(CiKind kind) { - if (kind == CiKind.Boolean) { - return 0; - } else if (kind == CiKind.Byte) { - return 1; - } else if (kind == CiKind.Short) { - return 2; - } else if (kind == CiKind.Char) { - return 3; - } else if (kind == CiKind.Int) { - return 4; - } else if (kind == CiKind.Float) { - return 5; - } else if (kind == CiKind.Long) { - return 6; - } else if (kind == CiKind.Double) { - return 7; - } else if (kind == CiKind.Object) { - return 8; - } else { - throw new RuntimeException(kind + " is not a Java kind"); - } + return arrayOffsets[kind.ordinal()]; } }