--- a/.hgignore	Mon Jan 07 08:38:40 2013 +0100
+++ b/.hgignore	Mon Jan 07 08:39:06 2013 +0100
@@ -12,6 +12,8 @@
 ^work/
 \.checkstyle$
 \.classpath
+\.factorypath
+\.externalToolBuilders
 \.project
 \.settings/
 \.metadata/
@@ -43,6 +45,7 @@
 ^test-output/
 scratch/
 bin/
+src_gen/
 ^local/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
@@ -59,3 +62,7 @@
 syntax: glob
 *.bgv
 core.*
+*.jar
+eclipse-build.xml
+rebuild-launch.out
+

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterConfig.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterConfig.java	Mon Jan 07 08:39:06 2013 +0100
@@ -50,12 +50,12 @@
      * Gets the calling convention describing how arguments are passed.
      *
      * @param type the type of calling convention being requested
-     * @param returnKind the return kind
-     * @param parameters the kinds of the arguments of the call
+     * @param returnType the return type (can be null for methods returning {@code void})
+     * @param parameterTypes the types of the arguments of the call
      * @param target the target platform
      * @param stackOnly ignore registers
      */
-    CallingConvention getCallingConvention(Type type, Kind returnKind, Kind[] parameters, TargetDescription target, boolean stackOnly);
+    CallingConvention getCallingConvention(Type type, JavaType returnType, JavaType[] parameterTypes, TargetDescription target, boolean stackOnly);
 
     /**
      * Gets the ordered set of registers that are can be used to pass parameters

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RuntimeCallTarget.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RuntimeCallTarget.java	Mon Jan 07 08:39:06 2013 +0100
@@ -24,8 +24,6 @@
 
 import java.util.*;
 
-import com.oracle.graal.api.meta.*;
-
 /**
  * The name, signature and calling convention of a call from compiled code to the runtime.
  * The target of such a call may be a leaf stub or a call into the runtime code proper.
@@ -38,14 +36,14 @@
     public static class Descriptor {
         private final String name;
         private final boolean hasSideEffect;
-        private final Kind resultKind;
-        private final Kind[] argumentKinds;
+        private final Class resultType;
+        private final Class[] argumentTypes;
 
-        public Descriptor(String name, boolean hasSideEffect, Kind resultKind, Kind... args) {
+        public Descriptor(String name, boolean hasSideEffect, Class resultType, Class... argumentTypes) {
             this.name = name;
             this.hasSideEffect = hasSideEffect;
-            this.resultKind = resultKind;
-            this.argumentKinds = args;
+            this.resultType = resultType;
+            this.argumentTypes = argumentTypes;
         }
 
         /**
@@ -67,15 +65,15 @@
         /**
          * Gets the return kind of this runtime call.
          */
-        public Kind getResultKind() {
-            return resultKind;
+        public Class getResultType() {
+            return resultType;
         }
 
         /**
          * Gets the argument kinds of this runtime call.
          */
-        public Kind[] getArgumentKinds() {
-            return argumentKinds.clone();
+        public Class[] getArgumentTypes() {
+            return argumentTypes.clone();
         }
 
         @Override
@@ -87,7 +85,7 @@
         public boolean equals(Object obj) {
             if (obj instanceof Descriptor) {
                 Descriptor nas = (Descriptor) obj;
-                return nas.name.equals(name) && nas.resultKind.equals(resultKind) && Arrays.equals(nas.argumentKinds, argumentKinds);
+                return nas.name.equals(name) && nas.resultType.equals(resultType) && Arrays.equals(nas.argumentTypes, argumentTypes);
             }
             return false;
         }
@@ -96,11 +94,11 @@
         public String toString() {
             StringBuilder sb = new StringBuilder(name).append('(');
             String sep = "";
-            for (Kind arg : argumentKinds) {
-                sb.append(sep).append(arg);
+            for (Class arg : argumentTypes) {
+                sb.append(sep).append(arg.getSimpleName());
                 sep = ",";
             }
-            return sb.append(')').append(resultKind).toString();
+            return sb.append(')').append(resultType.getSimpleName()).toString();
         }
     }
 

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/UnsignedMath.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/UnsignedMath.java	Mon Jan 07 08:39:06 2013 +0100
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.api.code;
 
+import java.math.*;
+
 //JaCoCo Exclude
 
 /**
@@ -87,5 +89,37 @@
     public static boolean belowOrEqual(long a, long b) {
         return (a <= b) ^ ((a < 0) != (b < 0));
     }
+
+    /**
+     * Unsigned division for two numbers.
+     */
+    public static int divide(int a, int b) {
+        return (int) ((a & MASK) / (b & MASK));
+    }
+
+    /**
+     * Unsigned remainder for two numbers.
+     */
+    public static int remainder(int a, int b) {
+        return (int) ((a & MASK) % (b & MASK));
+    }
+
+    /**
+     * Unsigned division for two numbers.
+     */
+    public static long divide(long a, long b) {
+        return bi(a).divide(bi(b)).longValue();
+    }
+
+    /**
+     * Unsigned remainder for two numbers.
+     */
+    public static long remainder(long a, long b) {
+        return bi(a).remainder(bi(b)).longValue();
+    }
+
+    private static BigInteger bi(long unsigned) {
+        return unsigned >= 0 ? BigInteger.valueOf(unsigned) : BigInteger.valueOf(unsigned & 0x7fffffffffffffffL).setBit(63);
+    }
 }
 

--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaType.java	Mon Jan 07 08:39:06 2013 +0100
@@ -23,6 +23,7 @@
 package com.oracle.graal.api.meta.test;
 
 import static com.oracle.graal.api.meta.test.TestMetaAccessProvider.*;
+import static java.lang.Integer.*;
 import static java.lang.reflect.Modifier.*;
 import static org.junit.Assert.*;
 
@@ -467,7 +468,7 @@
     public static ResolvedJavaField lookupField(ResolvedJavaField[] fields, Field key) {
         for (ResolvedJavaField rf : fields) {
             if (fieldsEqual(key, rf)) {
-                assert key.getModifiers() == rf.getModifiers() : key;
+                assert (fieldModifiers() & key.getModifiers()) == rf.getModifiers() : key + ": " + toHexString(key.getModifiers()) + " != " + toHexString(rf.getModifiers());
                 return rf;
             }
         }
@@ -477,7 +478,7 @@
     public static Field lookupField(Set<Field> fields, ResolvedJavaField key) {
         for (Field f : fields) {
             if (fieldsEqual(f, key)) {
-                assert key.getModifiers() == f.getModifiers() : key;
+                assert key.getModifiers() == (fieldModifiers() & f.getModifiers()) : key + ": " + toHexString(key.getModifiers()) + " != " + toHexString(f.getModifiers());
                 return f;
             }
         }

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Mon Jan 07 08:39:06 2013 +0100
@@ -431,4 +431,32 @@
                 throw new RuntimeException("cannot create Constant for boxed " + kind + " value");
         }
     }
+
+    /**
+     * Returns a constant with the default value for the given kind.
+     */
+    public static Constant defaultForKind(Kind kind) {
+        switch(kind) {
+            case Boolean:
+                return FALSE;
+            case Byte:
+                return forByte((byte) 0);
+            case Char:
+                return forChar((char) 0);
+            case Short:
+                return forShort((short) 0);
+            case Int:
+                return INT_0;
+            case Double:
+                return DOUBLE_0;
+            case Float:
+                return FLOAT_0;
+            case Long:
+                return LONG_0;
+            case Object:
+                return NULL_OBJECT;
+            default:
+                throw new IllegalArgumentException(kind.toString());
+        }
+    }
 }

--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/MetaUtil.java	Mon Jan 07 08:39:06 2013 +0100
@@ -46,6 +46,17 @@
     }
 
     /**
+     * Calls {@link MetaAccessProvider#lookupJavaType(Class)} on an array of classes.
+     */
+    public static ResolvedJavaType[] lookupJavaTypes(MetaAccessProvider metaAccess, Class[] classes) {
+        ResolvedJavaType[] result = new ResolvedJavaType[classes.length];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = metaAccess.lookupJavaType(classes[i]);
+        }
+        return result;
+    }
+
+    /**
      * Gets the {@link Class} mirror for a given resolved type.
      *
      * @param type the type for which the Java mirror is requested
@@ -460,29 +471,46 @@
         return sb.append(" [bci: ").append(bci).append(']');
     }
 
-    public static Kind[] signatureToKinds(ResolvedJavaMethod method) {
-        Kind receiver = isStatic(method.getModifiers()) ? null : method.getDeclaringClass().getKind();
-        return signatureToKinds(method.getSignature(), receiver);
+    public static JavaType[] signatureToTypes(ResolvedJavaMethod method) {
+        JavaType receiver = isStatic(method.getModifiers()) ? null : method.getDeclaringClass();
+        return signatureToTypes(method.getSignature(), receiver);
     }
 
-    public static Kind[] signatureToKinds(Signature signature, Kind receiverKind) {
+    public static JavaType[] signatureToTypes(Signature signature, JavaType receiverType) {
         int args = signature.getParameterCount(false);
-        Kind[] result;
+        JavaType[] result;
         int i = 0;
-        if (receiverKind != null) {
-            result = new Kind[args + 1];
-            result[0] = receiverKind;
+        if (receiverType != null) {
+            result = new JavaType[args + 1];
+            result[0] = receiverType;
             i = 1;
         } else {
-            result = new Kind[args];
+            result = new JavaType[args];
         }
         for (int j = 0; j < args; j++) {
-            result[i + j] = signature.getParameterKind(j);
+            result[i + j] = signature.getParameterType(j, null);
         }
         return result;
     }
 
     /**
+     * Converts a {@link Signature} to internal representation, i.e., the signature
+     * <pre>(int, String, double)void</pre> is converted to <pre>(ILjava/lang/String;D)V</pre>.
+     *
+     * @param sig the {@link Signature} to be converted.
+     *
+     * @return the signature's internal representation as a string.
+     */
+    public static String signatureToInternal(Signature sig) {
+        StringBuilder sb = new StringBuilder("(");
+        for (int i = 0; i < sig.getParameterCount(false); ++i) {
+            sb.append(sig.getParameterType(i, null).getName());
+        }
+        sb.append(')').append(sig.getReturnType(null).getName());
+        return sb.toString();
+    }
+
+    /**
      * Formats some profiling information associated as a string.
      *
      * @param info the profiling info to format

--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Mon Jan 07 08:39:06 2013 +0100
@@ -1553,6 +1553,38 @@
         emitArith(0x0B, 0xC0, dst, src);
     }
 
+    public final void popcntl(Register dst, Address src) {
+        emitByte(0xF3);
+        prefix(src, dst);
+        emitByte(0x0F);
+        emitByte(0xB8);
+        emitOperandHelper(dst, src);
+      }
+
+    public final void popcntl(Register dst, Register src) {
+        emitByte(0xF3);
+        int encode = prefixAndEncode(dst.encoding, src.encoding);
+        emitByte(0x0F);
+        emitByte(0xB8);
+        emitByte(0xC0 | encode);
+      }
+
+    public final void popcntq(Register dst, Address src) {
+        emitByte(0xF3);
+        prefixq(src, dst);
+        emitByte(0x0F);
+        emitByte(0xB8);
+        emitOperandHelper(dst, src);
+    }
+
+    public final void popcntq(Register dst, Register src) {
+        emitByte(0xF3);
+        int encode = prefixqAndEncode(dst.encoding, src.encoding);
+        emitByte(0x0F);
+        emitByte(0xB8);
+        emitByte(0xC0 | encode);
+    }
+
     // generic
     public final void pop(Register dst) {
         int encode = prefixAndEncode(dst.encoding);

--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64DeoptimizationStub.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64DeoptimizationStub.java	Mon Jan 07 08:39:06 2013 +0100
@@ -36,8 +36,8 @@
 
 public class AMD64DeoptimizationStub extends AMD64Code {
 
-    public static final Descriptor DEOPTIMIZE = new Descriptor("deoptimize", true, Kind.Void);
-    public static final Descriptor SET_DEOPT_INFO = new Descriptor("setDeoptInfo", true, Kind.Void, Kind.Object);
+    public static final Descriptor DEOPTIMIZE = new Descriptor("deoptimize", true, void.class);
+    public static final Descriptor SET_DEOPT_INFO = new Descriptor("setDeoptInfo", true, void.class, Object.class);
 
     public final Label label = new Label();
     public final LIRFrameState info;

--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java	Mon Jan 07 08:39:06 2013 +0100
@@ -26,6 +26,8 @@
 import static com.oracle.graal.api.code.ValueUtil.*;
 import static com.oracle.graal.lir.amd64.AMD64Arithmetic.*;
 import static com.oracle.graal.lir.amd64.AMD64Compare.*;
+import static com.oracle.graal.lir.amd64.AMD64BitManipulationOp.IntrinsicOpcode.*;
+import static com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode.*;
 
 import com.oracle.graal.amd64.*;
 import com.oracle.graal.api.code.*;
@@ -57,7 +59,6 @@
 import com.oracle.graal.lir.amd64.AMD64ControlFlow.SequentialSwitchOp;
 import com.oracle.graal.lir.amd64.AMD64ControlFlow.SwitchRangesOp;
 import com.oracle.graal.lir.amd64.AMD64ControlFlow.TableSwitchOp;
-import com.oracle.graal.lir.amd64.AMD64MathIntrinsicOp.IntrinsicOpcode;
 import com.oracle.graal.lir.amd64.AMD64Move.CompareAndSwapOp;
 import com.oracle.graal.lir.amd64.AMD64Move.LeaOp;
 import com.oracle.graal.lir.amd64.AMD64Move.LoadOp;
@@ -78,8 +79,8 @@
  */
 public abstract class AMD64LIRGenerator extends LIRGenerator {
 
-    public static final Descriptor ARITHMETIC_FREM = new Descriptor("arithmeticFrem", false, Kind.Float, Kind.Float, Kind.Float);
-    public static final Descriptor ARITHMETIC_DREM = new Descriptor("arithmeticDrem", false, Kind.Double, Kind.Double, Kind.Double);
+    public static final Descriptor ARITHMETIC_FREM = new Descriptor("arithmeticFrem", false, float.class, float.class, float.class);
+    public static final Descriptor ARITHMETIC_DREM = new Descriptor("arithmeticDrem", false, double.class, double.class, double.class);
 
     private static final RegisterValue RAX_I = AMD64.rax.asValue(Kind.Int);
     private static final RegisterValue RAX_L = AMD64.rax.asValue(Kind.Long);
@@ -528,6 +529,11 @@
             case MOV_L2D: append(new Op1Reg(MOV_L2D, result, input)); break;
             case MOV_F2I: append(new Op1Reg(MOV_F2I, result, input)); break;
             case MOV_D2L: append(new Op1Reg(MOV_D2L, result, input)); break;
+            case UNSIGNED_I2L:
+                // Instructions that move or generate 32-bit register values also set the upper 32 bits of the register to zero.
+                // Consequently, there is no need for a special zero-extension move.
+                emitMove(input, result);
+                break;
             default: throw GraalInternalError.shouldNotReachHere();
         }
         return result;
@@ -580,16 +586,25 @@
     }
 
     @Override
+    public void emitBitCount(Variable result, Value value) {
+        if (value.getKind().getStackKind() == Kind.Int) {
+            append(new AMD64BitManipulationOp(IPOPCNT, result, value));
+        } else {
+            append(new AMD64BitManipulationOp(LPOPCNT, result, value));
+        }
+    }
+
+    @Override
     public void emitBitScanForward(Variable result, Value value) {
-        append(new AMD64BitScanOp(AMD64BitScanOp.IntrinsicOpcode.BSF, result, value));
+        append(new AMD64BitManipulationOp(BSF, result, value));
     }
 
     @Override
     public void emitBitScanReverse(Variable result, Value value) {
         if (value.getKind().getStackKind() == Kind.Int) {
-            append(new AMD64BitScanOp(AMD64BitScanOp.IntrinsicOpcode.IBSR, result, value));
+            append(new AMD64BitManipulationOp(IBSR, result, value));
         } else {
-            append(new AMD64BitScanOp(AMD64BitScanOp.IntrinsicOpcode.LBSR, result, value));
+            append(new AMD64BitManipulationOp(LBSR, result, value));
         }
     }
 
@@ -600,28 +615,27 @@
 
     @Override
     public void emitMathSqrt(Variable result, Variable input) {
-        append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.IntrinsicOpcode.SQRT, result, input));
+        append(new AMD64MathIntrinsicOp(SQRT, result, input));
     }
 
     @Override
     public void emitMathLog(Variable result, Variable input, boolean base10) {
-        IntrinsicOpcode opcode = base10 ? AMD64MathIntrinsicOp.IntrinsicOpcode.LOG10 : AMD64MathIntrinsicOp.IntrinsicOpcode.LOG;
-        append(new AMD64MathIntrinsicOp(opcode, result, input));
+        append(new AMD64MathIntrinsicOp(base10 ? LOG10 : LOG, result, input));
     }
 
     @Override
     public void emitMathCos(Variable result, Variable input) {
-        append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.IntrinsicOpcode.COS, result, input));
+        append(new AMD64MathIntrinsicOp(COS, result, input));
     }
 
     @Override
     public void emitMathSin(Variable result, Variable input) {
-        append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.IntrinsicOpcode.SIN, result, input));
+        append(new AMD64MathIntrinsicOp(SIN, result, input));
     }
 
     @Override
     public void emitMathTan(Variable result, Variable input) {
-        append(new AMD64MathIntrinsicOp(AMD64MathIntrinsicOp.IntrinsicOpcode.TAN, result, input));
+        append(new AMD64MathIntrinsicOp(TAN, result, input));
     }
 
     @Override
@@ -702,12 +716,12 @@
 
     @Override
     public void visitBreakpointNode(BreakpointNode node) {
-        Kind[] sig = new Kind[node.arguments.size()];
+        JavaType[] sig = new JavaType[node.arguments.size()];
         for (int i = 0; i < sig.length; i++) {
-            sig[i] = node.arguments.get(i).kind();
+            sig[i] = node.arguments.get(i).stamp().javaType(runtime);
         }
 
-        CallingConvention cc = frameMap.registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, Kind.Void, sig, target(), false);
+        CallingConvention cc = frameMap.registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, sig, target(), false);
         Value[] parameters = visitInvokeArguments(cc, node.arguments);
         append(new AMD64BreakpointOp(parameters));
     }

--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java	Mon Jan 07 08:39:06 2013 +0100
@@ -241,7 +241,20 @@
         }
     }
 
+    /**
+     * Called before a test is executed.
+     */
+    protected void before() {
+    }
+
+    /**
+     * Called after a test is executed.
+     */
+    protected void after() {
+    }
+
     protected Result executeExpected(Method method, Object receiver, Object... args) {
+        before();
         try {
             // This gives us both the expected return value as well as ensuring that the method to be compiled is fully resolved
             return new Result(referenceInvoke(method, receiver, args), null);
@@ -249,10 +262,31 @@
             return new Result(null, e.getTargetException());
         } catch (Exception e) {
             throw new RuntimeException(e);
+        } finally {
+            after();
         }
     }
 
     protected Result executeActual(Method method, Object receiver, Object... args) {
+        before();
+        Object[] executeArgs = argsWithReceiver(receiver, args);
+
+        InstalledCode compiledMethod = getCode(runtime.lookupJavaMethod(method), parse(method));
+        try {
+            return new Result(compiledMethod.executeVarargs(executeArgs), null);
+        } catch (Throwable e) {
+            return new Result(null, e);
+        } finally {
+            after();
+        }
+    }
+
+    /**
+     * Prepends a non-null receiver argument to a given list or args.
+     *
+     * @param receiver the receiver argument to prepend if it is non-null
+     */
+    protected Object[] argsWithReceiver(Object receiver, Object... args) {
         Object[] executeArgs;
         if (receiver == null) {
             executeArgs = args;
@@ -263,13 +297,7 @@
                 executeArgs[i + 1] = args[i];
             }
         }
-
-        InstalledCode compiledMethod = getCode(runtime.lookupJavaMethod(method), parse(method));
-        try {
-            return new Result(compiledMethod.executeVarargs(executeArgs), null);
-        } catch (Throwable e) {
-            return new Result(null, e);
-        }
+        return executeArgs;
     }
 
     protected void test(String name, Object... args) {
@@ -349,8 +377,9 @@
             }
         });
 
-
-        cache.put(method, installedCode);
+        if (!forceCompile) {
+            cache.put(method, installedCode);
+        }
         return installedCode;
     }
 

--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java	Mon Jan 07 08:38:40 2013 +0100
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/LoopUnswitchTest.java	Mon Jan 07 08:39:06 2013 +0100
@@ -33,7 +33,6 @@
 
 public class LoopUnswitchTest extends GraalCompilerTest {
 
-    @SuppressWarnings("all")
     public static int referenceSnippet1(int a) {
         int sum = 0;
         if (a > 2) {
@@ -48,7 +47,7 @@
         return sum;
     }
 
-    @SuppressWarnings("all")
+
     public static int test1Snippet(int a) {
         int sum = 0;
         for (int i = 0; i < 1000; i++) {
@@ -61,11 +60,65 @@
         return sum;
     }
 
+    public static int referenceSnippet2(int a) {
+        int sum = 0;
+        switch(a) {
+        case 0:
+            for (int i = 0; i < 1000; i++) {
+                sum += System.currentTimeMillis();
+            }
+            break;
+        case 1:
+            for (int i = 0; i < 1000; i++) {
+                sum += 1;
+                sum += 5;
+            }
+            break;
+        case 55:
+            for (int i = 0; i < 1000; i++) {
+                sum += 5;
+            }
+            break;
+        default:
+            for (int i = 0; i < 1000; i++) {
+                //nothing
+            }
+            break;
+        }
+        return sum;
+    }
+
+    public static int test2Snippet(int a) {
+        int sum = 0;
+        for (int i = 0; i < 1000; i++) {
+            switch(a) {
+                case 0:
+                    sum += System.currentTimeMillis();
+                    break;
+                case 1:
+                    sum += 1;
+                    // fall through
+                case 55:
+                    sum += 5;
+                    break;
+                default:
+                    //nothing
+                    break;
+            }
+        }
+        return sum;
+    }
+
     @Test
     public void test1() {
         test("test1Snippet", "referenceSnippet1");
     }
 
+    @Test
+    public void test2() {
+        test("test2Snippet", "referenceSnippet2");
+    }
+
     private void test(String snippet, String referenceSnippet) {
         final StructuredGraph graph = parse(snippet);
         final StructuredGraph referenceGraph = parse(referenceSnippet);