You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2018/11/29 00:34:03 UTC

[16/46] tapestry-5 git commit: TAP5-2588: upgrading from ASM 6 to 7 for Java 9+ support

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1c71aec7/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/BasicVerifier.java
----------------------------------------------------------------------
diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/BasicVerifier.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/BasicVerifier.java
old mode 100644
new mode 100755
index c856b14..8a8f965
--- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/BasicVerifier.java
+++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/BasicVerifier.java
@@ -1,36 +1,33 @@
-/***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
+// ASM: a very small and fast Java bytecode manipulation framework
+// Copyright (c) 2000-2011 INRIA, France Telecom
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holders nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
 package org.apache.tapestry5.internal.plastic.asm.tree.analysis;
 
 import java.util.List;
-
 import org.apache.tapestry5.internal.plastic.asm.Type;
 import org.apache.tapestry5.internal.plastic.asm.tree.AbstractInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.FieldInsnNode;
@@ -38,396 +35,416 @@ import org.apache.tapestry5.internal.plastic.asm.tree.InvokeDynamicInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.MethodInsnNode;
 
 /**
- * An extended {@link BasicInterpreter} that checks that bytecode instructions
- * are correctly used.
- * 
+ * An extended {@link BasicInterpreter} that checks that bytecode instructions are correctly used.
+ *
  * @author Eric Bruneton
  * @author Bing Ran
  */
 public class BasicVerifier extends BasicInterpreter {
 
-    public BasicVerifier() {
-        super(ASM6);
+  /**
+   * Constructs a new {@link BasicVerifier} for the latest ASM API version. <i>Subclasses must not
+   * use this constructor</i>. Instead, they must use the {@link #BasicVerifier(int)} version.
+   */
+  public BasicVerifier() {
+    super(ASM7);
+    if (getClass() != BasicVerifier.class) {
+      throw new IllegalStateException();
     }
+  }
 
-    protected BasicVerifier(final int api) {
-        super(api);
-    }
+  /**
+   * Constructs a new {@link BasicVerifier}.
+   *
+   * @param api the ASM API version supported by this interpreter. Must be one of {@link
+   *     org.apache.tapestry5.internal.plastic.asm.Opcodes#ASM4}, {@link org.apache.tapestry5.internal.plastic.asm.Opcodes#ASM5}, {@link
+   *     org.apache.tapestry5.internal.plastic.asm.Opcodes#ASM6} or {@link org.apache.tapestry5.internal.plastic.asm.Opcodes#ASM7}.
+   */
+  protected BasicVerifier(final int api) {
+    super(api);
+  }
 
-    @Override
-    public BasicValue copyOperation(final AbstractInsnNode insn,
-            final BasicValue value) throws AnalyzerException {
-        Value expected;
-        switch (insn.getOpcode()) {
-        case ILOAD:
-        case ISTORE:
-            expected = BasicValue.INT_VALUE;
-            break;
-        case FLOAD:
-        case FSTORE:
-            expected = BasicValue.FLOAT_VALUE;
-            break;
-        case LLOAD:
-        case LSTORE:
-            expected = BasicValue.LONG_VALUE;
-            break;
-        case DLOAD:
-        case DSTORE:
-            expected = BasicValue.DOUBLE_VALUE;
-            break;
-        case ALOAD:
-            if (!value.isReference()) {
-                throw new AnalyzerException(insn, null, "an object reference",
-                        value);
-            }
-            return value;
-        case ASTORE:
-            if (!value.isReference()
-                    && !BasicValue.RETURNADDRESS_VALUE.equals(value)) {
-                throw new AnalyzerException(insn, null,
-                        "an object reference or a return address", value);
-            }
-            return value;
-        default:
-            return value;
+  @Override
+  public BasicValue copyOperation(final AbstractInsnNode insn, final BasicValue value)
+      throws AnalyzerException {
+    Value expected;
+    switch (insn.getOpcode()) {
+      case ILOAD:
+      case ISTORE:
+        expected = BasicValue.INT_VALUE;
+        break;
+      case FLOAD:
+      case FSTORE:
+        expected = BasicValue.FLOAT_VALUE;
+        break;
+      case LLOAD:
+      case LSTORE:
+        expected = BasicValue.LONG_VALUE;
+        break;
+      case DLOAD:
+      case DSTORE:
+        expected = BasicValue.DOUBLE_VALUE;
+        break;
+      case ALOAD:
+        if (!value.isReference()) {
+          throw new AnalyzerException(insn, null, "an object reference", value);
         }
-        if (!expected.equals(value)) {
-            throw new AnalyzerException(insn, null, expected, value);
+        return value;
+      case ASTORE:
+        if (!value.isReference() && !BasicValue.RETURNADDRESS_VALUE.equals(value)) {
+          throw new AnalyzerException(insn, null, "an object reference or a return address", value);
         }
         return value;
+      default:
+        return value;
+    }
+    if (!expected.equals(value)) {
+      throw new AnalyzerException(insn, null, expected, value);
     }
+    return value;
+  }
 
-    @Override
-    public BasicValue unaryOperation(final AbstractInsnNode insn,
-            final BasicValue value) throws AnalyzerException {
-        BasicValue expected;
-        switch (insn.getOpcode()) {
-        case INEG:
-        case IINC:
-        case I2F:
-        case I2L:
-        case I2D:
-        case I2B:
-        case I2C:
-        case I2S:
-        case IFEQ:
-        case IFNE:
-        case IFLT:
-        case IFGE:
-        case IFGT:
-        case IFLE:
-        case TABLESWITCH:
-        case LOOKUPSWITCH:
-        case IRETURN:
-        case NEWARRAY:
-        case ANEWARRAY:
-            expected = BasicValue.INT_VALUE;
-            break;
-        case FNEG:
-        case F2I:
-        case F2L:
-        case F2D:
-        case FRETURN:
-            expected = BasicValue.FLOAT_VALUE;
-            break;
-        case LNEG:
-        case L2I:
-        case L2F:
-        case L2D:
-        case LRETURN:
-            expected = BasicValue.LONG_VALUE;
-            break;
-        case DNEG:
-        case D2I:
-        case D2F:
-        case D2L:
-        case DRETURN:
-            expected = BasicValue.DOUBLE_VALUE;
-            break;
-        case GETFIELD:
-            expected = newValue(Type
-                    .getObjectType(((FieldInsnNode) insn).owner));
-            break;
-        case CHECKCAST:
-            if (!value.isReference()) {
-                throw new AnalyzerException(insn, null, "an object reference",
-                        value);
-            }
-            return super.unaryOperation(insn, value);
-        case ARRAYLENGTH:
-            if (!isArrayValue(value)) {
-                throw new AnalyzerException(insn, null, "an array reference",
-                        value);
-            }
-            return super.unaryOperation(insn, value);
-        case ARETURN:
-        case ATHROW:
-        case INSTANCEOF:
-        case MONITORENTER:
-        case MONITOREXIT:
-        case IFNULL:
-        case IFNONNULL:
-            if (!value.isReference()) {
-                throw new AnalyzerException(insn, null, "an object reference",
-                        value);
-            }
-            return super.unaryOperation(insn, value);
-        case PUTSTATIC:
-            expected = newValue(Type.getType(((FieldInsnNode) insn).desc));
-            break;
-        default:
-            throw new Error("Internal error.");
+  @Override
+  public BasicValue unaryOperation(final AbstractInsnNode insn, final BasicValue value)
+      throws AnalyzerException {
+    BasicValue expected;
+    switch (insn.getOpcode()) {
+      case INEG:
+      case IINC:
+      case I2F:
+      case I2L:
+      case I2D:
+      case I2B:
+      case I2C:
+      case I2S:
+      case IFEQ:
+      case IFNE:
+      case IFLT:
+      case IFGE:
+      case IFGT:
+      case IFLE:
+      case TABLESWITCH:
+      case LOOKUPSWITCH:
+      case IRETURN:
+      case NEWARRAY:
+      case ANEWARRAY:
+        expected = BasicValue.INT_VALUE;
+        break;
+      case FNEG:
+      case F2I:
+      case F2L:
+      case F2D:
+      case FRETURN:
+        expected = BasicValue.FLOAT_VALUE;
+        break;
+      case LNEG:
+      case L2I:
+      case L2F:
+      case L2D:
+      case LRETURN:
+        expected = BasicValue.LONG_VALUE;
+        break;
+      case DNEG:
+      case D2I:
+      case D2F:
+      case D2L:
+      case DRETURN:
+        expected = BasicValue.DOUBLE_VALUE;
+        break;
+      case GETFIELD:
+        expected = newValue(Type.getObjectType(((FieldInsnNode) insn).owner));
+        break;
+      case ARRAYLENGTH:
+        if (!isArrayValue(value)) {
+          throw new AnalyzerException(insn, null, "an array reference", value);
         }
-        if (!isSubTypeOf(value, expected)) {
-            throw new AnalyzerException(insn, null, expected, value);
+        return super.unaryOperation(insn, value);
+      case CHECKCAST:
+      case ARETURN:
+      case ATHROW:
+      case INSTANCEOF:
+      case MONITORENTER:
+      case MONITOREXIT:
+      case IFNULL:
+      case IFNONNULL:
+        if (!value.isReference()) {
+          throw new AnalyzerException(insn, null, "an object reference", value);
         }
         return super.unaryOperation(insn, value);
+      case PUTSTATIC:
+        expected = newValue(Type.getType(((FieldInsnNode) insn).desc));
+        break;
+      default:
+        throw new AssertionError();
+    }
+    if (!isSubTypeOf(value, expected)) {
+      throw new AnalyzerException(insn, null, expected, value);
     }
+    return super.unaryOperation(insn, value);
+  }
 
-    @Override
-    public BasicValue binaryOperation(final AbstractInsnNode insn,
-            final BasicValue value1, final BasicValue value2)
-            throws AnalyzerException {
-        BasicValue expected1;
-        BasicValue expected2;
-        switch (insn.getOpcode()) {
-        case IALOAD:
-            expected1 = newValue(Type.getType("[I"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case BALOAD:
-            if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
-                expected1 = newValue(Type.getType("[Z"));
-            } else {
-                expected1 = newValue(Type.getType("[B"));
-            }
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case CALOAD:
-            expected1 = newValue(Type.getType("[C"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case SALOAD:
-            expected1 = newValue(Type.getType("[S"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case LALOAD:
-            expected1 = newValue(Type.getType("[J"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case FALOAD:
-            expected1 = newValue(Type.getType("[F"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case DALOAD:
-            expected1 = newValue(Type.getType("[D"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case AALOAD:
-            expected1 = newValue(Type.getType("[Ljava/lang/Object;"));
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case IADD:
-        case ISUB:
-        case IMUL:
-        case IDIV:
-        case IREM:
-        case ISHL:
-        case ISHR:
-        case IUSHR:
-        case IAND:
-        case IOR:
-        case IXOR:
-        case IF_ICMPEQ:
-        case IF_ICMPNE:
-        case IF_ICMPLT:
-        case IF_ICMPGE:
-        case IF_ICMPGT:
-        case IF_ICMPLE:
-            expected1 = BasicValue.INT_VALUE;
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case FADD:
-        case FSUB:
-        case FMUL:
-        case FDIV:
-        case FREM:
-        case FCMPL:
-        case FCMPG:
-            expected1 = BasicValue.FLOAT_VALUE;
-            expected2 = BasicValue.FLOAT_VALUE;
-            break;
-        case LADD:
-        case LSUB:
-        case LMUL:
-        case LDIV:
-        case LREM:
-        case LAND:
-        case LOR:
-        case LXOR:
-        case LCMP:
-            expected1 = BasicValue.LONG_VALUE;
-            expected2 = BasicValue.LONG_VALUE;
-            break;
-        case LSHL:
-        case LSHR:
-        case LUSHR:
-            expected1 = BasicValue.LONG_VALUE;
-            expected2 = BasicValue.INT_VALUE;
-            break;
-        case DADD:
-        case DSUB:
-        case DMUL:
-        case DDIV:
-        case DREM:
-        case DCMPL:
-        case DCMPG:
-            expected1 = BasicValue.DOUBLE_VALUE;
-            expected2 = BasicValue.DOUBLE_VALUE;
-            break;
-        case IF_ACMPEQ:
-        case IF_ACMPNE:
-            expected1 = BasicValue.REFERENCE_VALUE;
-            expected2 = BasicValue.REFERENCE_VALUE;
-            break;
-        case PUTFIELD:
-            FieldInsnNode fin = (FieldInsnNode) insn;
-            expected1 = newValue(Type.getObjectType(fin.owner));
-            expected2 = newValue(Type.getType(fin.desc));
-            break;
-        default:
-            throw new Error("Internal error.");
-        }
-        if (!isSubTypeOf(value1, expected1)) {
-            throw new AnalyzerException(insn, "First argument", expected1,
-                    value1);
-        } else if (!isSubTypeOf(value2, expected2)) {
-            throw new AnalyzerException(insn, "Second argument", expected2,
-                    value2);
-        }
-        if (insn.getOpcode() == AALOAD) {
-            return getElementValue(value1);
+  @Override
+  public BasicValue binaryOperation(
+      final AbstractInsnNode insn, final BasicValue value1, final BasicValue value2)
+      throws AnalyzerException {
+    BasicValue expected1;
+    BasicValue expected2;
+    switch (insn.getOpcode()) {
+      case IALOAD:
+        expected1 = newValue(Type.getType("[I"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case BALOAD:
+        if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+          expected1 = newValue(Type.getType("[Z"));
         } else {
-            return super.binaryOperation(insn, value1, value2);
+          expected1 = newValue(Type.getType("[B"));
         }
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case CALOAD:
+        expected1 = newValue(Type.getType("[C"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case SALOAD:
+        expected1 = newValue(Type.getType("[S"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case LALOAD:
+        expected1 = newValue(Type.getType("[J"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case FALOAD:
+        expected1 = newValue(Type.getType("[F"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case DALOAD:
+        expected1 = newValue(Type.getType("[D"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case AALOAD:
+        expected1 = newValue(Type.getType("[Ljava/lang/Object;"));
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case IADD:
+      case ISUB:
+      case IMUL:
+      case IDIV:
+      case IREM:
+      case ISHL:
+      case ISHR:
+      case IUSHR:
+      case IAND:
+      case IOR:
+      case IXOR:
+      case IF_ICMPEQ:
+      case IF_ICMPNE:
+      case IF_ICMPLT:
+      case IF_ICMPGE:
+      case IF_ICMPGT:
+      case IF_ICMPLE:
+        expected1 = BasicValue.INT_VALUE;
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case FADD:
+      case FSUB:
+      case FMUL:
+      case FDIV:
+      case FREM:
+      case FCMPL:
+      case FCMPG:
+        expected1 = BasicValue.FLOAT_VALUE;
+        expected2 = BasicValue.FLOAT_VALUE;
+        break;
+      case LADD:
+      case LSUB:
+      case LMUL:
+      case LDIV:
+      case LREM:
+      case LAND:
+      case LOR:
+      case LXOR:
+      case LCMP:
+        expected1 = BasicValue.LONG_VALUE;
+        expected2 = BasicValue.LONG_VALUE;
+        break;
+      case LSHL:
+      case LSHR:
+      case LUSHR:
+        expected1 = BasicValue.LONG_VALUE;
+        expected2 = BasicValue.INT_VALUE;
+        break;
+      case DADD:
+      case DSUB:
+      case DMUL:
+      case DDIV:
+      case DREM:
+      case DCMPL:
+      case DCMPG:
+        expected1 = BasicValue.DOUBLE_VALUE;
+        expected2 = BasicValue.DOUBLE_VALUE;
+        break;
+      case IF_ACMPEQ:
+      case IF_ACMPNE:
+        expected1 = BasicValue.REFERENCE_VALUE;
+        expected2 = BasicValue.REFERENCE_VALUE;
+        break;
+      case PUTFIELD:
+        FieldInsnNode fieldInsn = (FieldInsnNode) insn;
+        expected1 = newValue(Type.getObjectType(fieldInsn.owner));
+        expected2 = newValue(Type.getType(fieldInsn.desc));
+        break;
+      default:
+        throw new AssertionError();
     }
-
-    @Override
-    public BasicValue ternaryOperation(final AbstractInsnNode insn,
-            final BasicValue value1, final BasicValue value2,
-            final BasicValue value3) throws AnalyzerException {
-        BasicValue expected1;
-        BasicValue expected3;
-        switch (insn.getOpcode()) {
-        case IASTORE:
-            expected1 = newValue(Type.getType("[I"));
-            expected3 = BasicValue.INT_VALUE;
-            break;
-        case BASTORE:
-            if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
-                expected1 = newValue(Type.getType("[Z"));
-            } else {
-                expected1 = newValue(Type.getType("[B"));
-            }
-            expected3 = BasicValue.INT_VALUE;
-            break;
-        case CASTORE:
-            expected1 = newValue(Type.getType("[C"));
-            expected3 = BasicValue.INT_VALUE;
-            break;
-        case SASTORE:
-            expected1 = newValue(Type.getType("[S"));
-            expected3 = BasicValue.INT_VALUE;
-            break;
-        case LASTORE:
-            expected1 = newValue(Type.getType("[J"));
-            expected3 = BasicValue.LONG_VALUE;
-            break;
-        case FASTORE:
-            expected1 = newValue(Type.getType("[F"));
-            expected3 = BasicValue.FLOAT_VALUE;
-            break;
-        case DASTORE:
-            expected1 = newValue(Type.getType("[D"));
-            expected3 = BasicValue.DOUBLE_VALUE;
-            break;
-        case AASTORE:
-            expected1 = value1;
-            expected3 = BasicValue.REFERENCE_VALUE;
-            break;
-        default:
-            throw new Error("Internal error.");
-        }
-        if (!isSubTypeOf(value1, expected1)) {
-            throw new AnalyzerException(insn, "First argument", "a "
-                    + expected1 + " array reference", value1);
-        } else if (!BasicValue.INT_VALUE.equals(value2)) {
-            throw new AnalyzerException(insn, "Second argument",
-                    BasicValue.INT_VALUE, value2);
-        } else if (!isSubTypeOf(value3, expected3)) {
-            throw new AnalyzerException(insn, "Third argument", expected3,
-                    value3);
-        }
-        return null;
+    if (!isSubTypeOf(value1, expected1)) {
+      throw new AnalyzerException(insn, "First argument", expected1, value1);
+    } else if (!isSubTypeOf(value2, expected2)) {
+      throw new AnalyzerException(insn, "Second argument", expected2, value2);
+    }
+    if (insn.getOpcode() == AALOAD) {
+      return getElementValue(value1);
+    } else {
+      return super.binaryOperation(insn, value1, value2);
     }
+  }
 
-    @Override
-    public BasicValue naryOperation(final AbstractInsnNode insn,
-            final List<? extends BasicValue> values) throws AnalyzerException {
-        int opcode = insn.getOpcode();
-        if (opcode == MULTIANEWARRAY) {
-            for (int i = 0; i < values.size(); ++i) {
-                if (!BasicValue.INT_VALUE.equals(values.get(i))) {
-                    throw new AnalyzerException(insn, null,
-                            BasicValue.INT_VALUE, values.get(i));
-                }
-            }
+  @Override
+  public BasicValue ternaryOperation(
+      final AbstractInsnNode insn,
+      final BasicValue value1,
+      final BasicValue value2,
+      final BasicValue value3)
+      throws AnalyzerException {
+    BasicValue expected1;
+    BasicValue expected3;
+    switch (insn.getOpcode()) {
+      case IASTORE:
+        expected1 = newValue(Type.getType("[I"));
+        expected3 = BasicValue.INT_VALUE;
+        break;
+      case BASTORE:
+        if (isSubTypeOf(value1, newValue(Type.getType("[Z")))) {
+          expected1 = newValue(Type.getType("[Z"));
         } else {
-            int i = 0;
-            int j = 0;
-            if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) {
-                Type owner = Type.getObjectType(((MethodInsnNode) insn).owner);
-                if (!isSubTypeOf(values.get(i++), newValue(owner))) {
-                    throw new AnalyzerException(insn, "Method owner",
-                            newValue(owner), values.get(0));
-                }
-            }
-            String desc = (opcode == INVOKEDYNAMIC) ? ((InvokeDynamicInsnNode) insn).desc
-                    : ((MethodInsnNode) insn).desc;
-            Type[] args = Type.getArgumentTypes(desc);
-            while (i < values.size()) {
-                BasicValue expected = newValue(args[j++]);
-                BasicValue encountered = values.get(i++);
-                if (!isSubTypeOf(encountered, expected)) {
-                    throw new AnalyzerException(insn, "Argument " + j,
-                            expected, encountered);
-                }
-            }
+          expected1 = newValue(Type.getType("[B"));
         }
-        return super.naryOperation(insn, values);
+        expected3 = BasicValue.INT_VALUE;
+        break;
+      case CASTORE:
+        expected1 = newValue(Type.getType("[C"));
+        expected3 = BasicValue.INT_VALUE;
+        break;
+      case SASTORE:
+        expected1 = newValue(Type.getType("[S"));
+        expected3 = BasicValue.INT_VALUE;
+        break;
+      case LASTORE:
+        expected1 = newValue(Type.getType("[J"));
+        expected3 = BasicValue.LONG_VALUE;
+        break;
+      case FASTORE:
+        expected1 = newValue(Type.getType("[F"));
+        expected3 = BasicValue.FLOAT_VALUE;
+        break;
+      case DASTORE:
+        expected1 = newValue(Type.getType("[D"));
+        expected3 = BasicValue.DOUBLE_VALUE;
+        break;
+      case AASTORE:
+        expected1 = value1;
+        expected3 = BasicValue.REFERENCE_VALUE;
+        break;
+      default:
+        throw new AssertionError();
+    }
+    if (!isSubTypeOf(value1, expected1)) {
+      throw new AnalyzerException(
+          insn, "First argument", "a " + expected1 + " array reference", value1);
+    } else if (!BasicValue.INT_VALUE.equals(value2)) {
+      throw new AnalyzerException(insn, "Second argument", BasicValue.INT_VALUE, value2);
+    } else if (!isSubTypeOf(value3, expected3)) {
+      throw new AnalyzerException(insn, "Third argument", expected3, value3);
     }
+    return null;
+  }
 
-    @Override
-    public void returnOperation(final AbstractInsnNode insn,
-            final BasicValue value, final BasicValue expected)
-            throws AnalyzerException {
-        if (!isSubTypeOf(value, expected)) {
-            throw new AnalyzerException(insn, "Incompatible return type",
-                    expected, value);
+  @Override
+  public BasicValue naryOperation(
+      final AbstractInsnNode insn, final List<? extends BasicValue> values)
+      throws AnalyzerException {
+    int opcode = insn.getOpcode();
+    if (opcode == MULTIANEWARRAY) {
+      for (BasicValue value : values) {
+        if (!BasicValue.INT_VALUE.equals(value)) {
+          throw new AnalyzerException(insn, null, BasicValue.INT_VALUE, value);
         }
+      }
+    } else {
+      int i = 0;
+      int j = 0;
+      if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) {
+        Type owner = Type.getObjectType(((MethodInsnNode) insn).owner);
+        if (!isSubTypeOf(values.get(i++), newValue(owner))) {
+          throw new AnalyzerException(insn, "Method owner", newValue(owner), values.get(0));
+        }
+      }
+      String methodDescriptor =
+          (opcode == INVOKEDYNAMIC)
+              ? ((InvokeDynamicInsnNode) insn).desc
+              : ((MethodInsnNode) insn).desc;
+      Type[] args = Type.getArgumentTypes(methodDescriptor);
+      while (i < values.size()) {
+        BasicValue expected = newValue(args[j++]);
+        BasicValue actual = values.get(i++);
+        if (!isSubTypeOf(actual, expected)) {
+          throw new AnalyzerException(insn, "Argument " + j, expected, actual);
+        }
+      }
     }
+    return super.naryOperation(insn, values);
+  }
 
-    protected boolean isArrayValue(final BasicValue value) {
-        return value.isReference();
+  @Override
+  public void returnOperation(
+      final AbstractInsnNode insn, final BasicValue value, final BasicValue expected)
+      throws AnalyzerException {
+    if (!isSubTypeOf(value, expected)) {
+      throw new AnalyzerException(insn, "Incompatible return type", expected, value);
     }
+  }
 
-    protected BasicValue getElementValue(final BasicValue objectArrayValue)
-            throws AnalyzerException {
-        return BasicValue.REFERENCE_VALUE;
-    }
+  /**
+   * Returns whether the given value corresponds to an array reference.
+   *
+   * @param value a value.
+   * @return whether 'value' corresponds to an array reference.
+   */
+  protected boolean isArrayValue(final BasicValue value) {
+    return value.isReference();
+  }
 
-    protected boolean isSubTypeOf(final BasicValue value,
-            final BasicValue expected) {
-        return value.equals(expected);
-    }
+  /**
+   * Returns the value corresponding to the type of the elements of the given array reference value.
+   *
+   * @param objectArrayValue a value corresponding to array of object (or array) references.
+   * @return the value corresponding to the type of the elements of 'objectArrayValue'.
+   * @throws AnalyzerException if objectArrayValue does not correspond to an array type.
+   */
+  protected BasicValue getElementValue(final BasicValue objectArrayValue) throws AnalyzerException {
+    return BasicValue.REFERENCE_VALUE;
+  }
+
+  /**
+   * Returns whether the type corresponding to the first argument is a subtype of the type
+   * corresponding to the second argument.
+   *
+   * @param value a value.
+   * @param expected another value.
+   * @return whether the type corresponding to 'value' is a subtype of the type corresponding to
+   *     'expected'.
+   */
+  protected boolean isSubTypeOf(final BasicValue value, final BasicValue expected) {
+    return value.equals(expected);
+  }
 }

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1c71aec7/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/Frame.java
----------------------------------------------------------------------
diff --git a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/Frame.java b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/Frame.java
old mode 100644
new mode 100755
index 9c74a62..09549cd
--- a/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/Frame.java
+++ b/plastic/src/external/java/org/apache/tapestry5/internal/plastic/asm/tree/analysis/Frame.java
@@ -1,739 +1,730 @@
-/***
- * ASM: a very small and fast Java bytecode manipulation framework
- * Copyright (c) 2000-2011 INRIA, France Telecom
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
+// ASM: a very small and fast Java bytecode manipulation framework
+// Copyright (c) 2000-2011 INRIA, France Telecom
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holders nor the names of its
+//    contributors may be used to endorse or promote products derived from
+//    this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
 package org.apache.tapestry5.internal.plastic.asm.tree.analysis;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.tapestry5.internal.plastic.asm.Opcodes;
 import org.apache.tapestry5.internal.plastic.asm.Type;
 import org.apache.tapestry5.internal.plastic.asm.tree.AbstractInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.IincInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.InvokeDynamicInsnNode;
+import org.apache.tapestry5.internal.plastic.asm.tree.LabelNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.MethodInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.MultiANewArrayInsnNode;
 import org.apache.tapestry5.internal.plastic.asm.tree.VarInsnNode;
 
 /**
- * A symbolic execution stack frame. A stack frame contains a set of local
- * variable slots, and an operand stack. Warning: long and double values are
- * represented by <i>two</i> slots in local variables, and by <i>one</i> slot in
- * the operand stack.
- * 
- * @param <V>
- *            type of the Value used for the analysis.
- * 
+ * A symbolic execution stack frame. A stack frame contains a set of local variable slots, and an
+ * operand stack. Warning: long and double values are represented with <i>two</i> slots in local
+ * variables, and with <i>one</i> slot in the operand stack.
+ *
+ * @param <V> type of the Value used for the analysis.
  * @author Eric Bruneton
  */
 public class Frame<V extends Value> {
 
-    /**
-     * The expected return type of the analyzed method, or <tt>null</tt> if the
-     * method returns void.
-     */
-    private V returnValue;
+  /**
+   * The expected return type of the analyzed method, or {@literal null} if the method returns void.
+   */
+  private V returnValue;
 
-    /**
-     * The local variables and operand stack of this frame.
-     */
-    private V[] values;
+  /**
+   * The local variables and the operand stack of this frame. The first {@link #numLocals} elements
+   * correspond to the local variables. The following {@link #numStack} elements correspond to the
+   * operand stack.
+   */
+  private V[] values;
 
-    /**
-     * The number of local variables of this frame.
-     */
-    private int locals;
+  /** The number of local variables of this frame. */
+  private int numLocals;
 
-    /**
-     * The number of elements in the operand stack.
-     */
-    private int top;
+  /** The number of elements in the operand stack. */
+  private int numStack;
 
-    /**
-     * Constructs a new frame with the given size.
-     * 
-     * @param nLocals
-     *            the maximum number of local variables of the frame.
-     * @param nStack
-     *            the maximum stack size of the frame.
-     */
-    @SuppressWarnings("unchecked")
-    public Frame(final int nLocals, final int nStack) {
-        this.values = (V[]) new Value[nLocals + nStack];
-        this.locals = nLocals;
-    }
+  /**
+   * Constructs a new frame with the given size.
+   *
+   * @param numLocals the maximum number of local variables of the frame.
+   * @param numStack the maximum stack size of the frame.
+   */
+  @SuppressWarnings("unchecked")
+  public Frame(final int numLocals, final int numStack) {
+    this.values = (V[]) new Value[numLocals + numStack];
+    this.numLocals = numLocals;
+  }
 
-    /**
-     * Constructs a new frame that is identical to the given frame.
-     * 
-     * @param src
-     *            a frame.
-     */
-    public Frame(final Frame<? extends V> src) {
-        this(src.locals, src.values.length - src.locals);
-        init(src);
-    }
+  /**
+   * Constructs a copy of the given Frame.
+   *
+   * @param frame a frame.
+   */
+  public Frame(final Frame<? extends V> frame) {
+    this(frame.numLocals, frame.values.length - frame.numLocals);
+    init(frame); // NOPMD(ConstructorCallsOverridableMethod): can't fix for backward compatibility.
+  }
 
-    /**
-     * Copies the state of the given frame into this frame.
-     * 
-     * @param src
-     *            a frame.
-     * @return this frame.
-     */
-    public Frame<V> init(final Frame<? extends V> src) {
-        returnValue = src.returnValue;
-        System.arraycopy(src.values, 0, values, 0, values.length);
-        top = src.top;
-        return this;
-    }
+  /**
+   * Copies the state of the given frame into this frame.
+   *
+   * @param frame a frame.
+   * @return this frame.
+   */
+  public Frame<V> init(final Frame<? extends V> frame) {
+    returnValue = frame.returnValue;
+    System.arraycopy(frame.values, 0, values, 0, values.length);
+    numStack = frame.numStack;
+    return this;
+  }
 
-    /**
-     * Sets the expected return type of the analyzed method.
-     * 
-     * @param v
-     *            the expected return type of the analyzed method, or
-     *            <tt>null</tt> if the method returns void.
-     */
-    public void setReturn(final V v) {
-        returnValue = v;
-    }
+  /**
+   * Initializes a frame corresponding to the target or to the successor of a jump instruction. This
+   * method is called by {@link Analyzer#analyze(String, org.apache.tapestry5.internal.plastic.asm.tree.MethodNode)} while
+   * interpreting jump instructions. It is called once for each possible target of the jump
+   * instruction, and once for its successor instruction (except for GOTO and JSR), before the frame
+   * is merged with the existing frame at this location. The default implementation of this method
+   * does nothing.
+   *
+   * <p>Overriding this method and changing the frame values allows implementing branch-sensitive
+   * analyses.
+   *
+   * @param opcode the opcode of the jump instruction. Can be IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE,
+   *     IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE,
+   *     GOTO, JSR, IFNULL, IFNONNULL, TABLESWITCH or LOOKUPSWITCH.
+   * @param target a target of the jump instruction this frame corresponds to, or {@literal null} if
+   *     this frame corresponds to the successor of the jump instruction (i.e. the next instruction
+   *     in the instructions sequence).
+   */
+  public void initJumpTarget(final int opcode, final LabelNode target) {}
 
-    /**
-     * Returns the maximum number of local variables of this frame.
-     * 
-     * @return the maximum number of local variables of this frame.
-     */
-    public int getLocals() {
-        return locals;
-    }
+  /**
+   * Sets the expected return type of the analyzed method.
+   *
+   * @param v the expected return type of the analyzed method, or {@literal null} if the method
+   *     returns void.
+   */
+  public void setReturn(final V v) {
+    returnValue = v;
+  }
 
-    /**
-     * Returns the maximum stack size of this frame.
-     * 
-     * @return the maximum stack size of this frame.
-     */
-    public int getMaxStackSize() {
-        return values.length - locals;
-    }
-    
-    /**
-     * Returns the value of the given local variable.
-     * 
-     * @param i
-     *            a local variable index.
-     * @return the value of the given local variable.
-     * @throws IndexOutOfBoundsException
-     *             if the variable does not exist.
-     */
-    public V getLocal(final int i) throws IndexOutOfBoundsException {
-        if (i >= locals) {
-            throw new IndexOutOfBoundsException(
-                    "Trying to access an inexistant local variable");
-        }
-        return values[i];
-    }
+  /**
+   * Returns the maximum number of local variables of this frame.
+   *
+   * @return the maximum number of local variables of this frame.
+   */
+  public int getLocals() {
+    return numLocals;
+  }
 
-    /**
-     * Sets the value of the given local variable.
-     * 
-     * @param i
-     *            a local variable index.
-     * @param value
-     *            the new value of this local variable.
-     * @throws IndexOutOfBoundsException
-     *             if the variable does not exist.
-     */
-    public void setLocal(final int i, final V value)
-            throws IndexOutOfBoundsException {
-        if (i >= locals) {
-            throw new IndexOutOfBoundsException(
-                    "Trying to access an inexistant local variable " + i);
-        }
-        values[i] = value;
-    }
+  /**
+   * Returns the maximum stack size of this frame.
+   *
+   * @return the maximum stack size of this frame.
+   */
+  public int getMaxStackSize() {
+    return values.length - numLocals;
+  }
 
-    /**
-     * Returns the number of values in the operand stack of this frame. Long and
-     * double values are treated as single values.
-     * 
-     * @return the number of values in the operand stack of this frame.
-     */
-    public int getStackSize() {
-        return top;
+  /**
+   * Returns the value of the given local variable.
+   *
+   * @param index a local variable index.
+   * @return the value of the given local variable.
+   * @throws IndexOutOfBoundsException if the variable does not exist.
+   */
+  public V getLocal(final int index) {
+    if (index >= numLocals) {
+      throw new IndexOutOfBoundsException("Trying to access an inexistant local variable");
     }
+    return values[index];
+  }
 
-    /**
-     * Returns the value of the given operand stack slot.
-     * 
-     * @param i
-     *            the index of an operand stack slot.
-     * @return the value of the given operand stack slot.
-     * @throws IndexOutOfBoundsException
-     *             if the operand stack slot does not exist.
-     */
-    public V getStack(final int i) throws IndexOutOfBoundsException {
-        return values[i + locals];
+  /**
+   * Sets the value of the given local variable.
+   *
+   * @param index a local variable index.
+   * @param value the new value of this local variable.
+   * @throws IndexOutOfBoundsException if the variable does not exist.
+   */
+  public void setLocal(final int index, final V value) {
+    if (index >= numLocals) {
+      throw new IndexOutOfBoundsException("Trying to access an inexistant local variable " + index);
     }
+    values[index] = value;
+  }
 
-    /**
-     * Clears the operand stack of this frame.
-     */
-    public void clearStack() {
-        top = 0;
-    }
+  /**
+   * Returns the number of values in the operand stack of this frame. Long and double values are
+   * treated as single values.
+   *
+   * @return the number of values in the operand stack of this frame.
+   */
+  public int getStackSize() {
+    return numStack;
+  }
 
-    /**
-     * Pops a value from the operand stack of this frame.
-     * 
-     * @return the value that has been popped from the stack.
-     * @throws IndexOutOfBoundsException
-     *             if the operand stack is empty.
-     */
-    public V pop() throws IndexOutOfBoundsException {
-        if (top == 0) {
-            throw new IndexOutOfBoundsException(
-                    "Cannot pop operand off an empty stack.");
-        }
-        return values[--top + locals];
+  /**
+   * Returns the value of the given operand stack slot.
+   *
+   * @param index the index of an operand stack slot.
+   * @return the value of the given operand stack slot.
+   * @throws IndexOutOfBoundsException if the operand stack slot does not exist.
+   */
+  public V getStack(final int index) {
+    return values[numLocals + index];
+  }
+
+  /**
+   * Sets the value of the given stack slot.
+   *
+   * @param index the index of an operand stack slot.
+   * @param value the new value of the stack slot.
+   * @throws IndexOutOfBoundsException if the stack slot does not exist.
+   */
+  public void setStack(final int index, final V value) throws IndexOutOfBoundsException {
+    values[numLocals + index] = value;
+  }
+
+  /** Clears the operand stack of this frame. */
+  public void clearStack() {
+    numStack = 0;
+  }
+
+  /**
+   * Pops a value from the operand stack of this frame.
+   *
+   * @return the value that has been popped from the stack.
+   * @throws IndexOutOfBoundsException if the operand stack is empty.
+   */
+  public V pop() {
+    if (numStack == 0) {
+      throw new IndexOutOfBoundsException("Cannot pop operand off an empty stack.");
     }
+    return values[numLocals + (--numStack)];
+  }
 
-    /**
-     * Pushes a value into the operand stack of this frame.
-     * 
-     * @param value
-     *            the value that must be pushed into the stack.
-     * @throws IndexOutOfBoundsException
-     *             if the operand stack is full.
-     */
-    public void push(final V value) throws IndexOutOfBoundsException {
-        if (top + locals >= values.length) {
-            throw new IndexOutOfBoundsException(
-                    "Insufficient maximum stack size.");
-        }
-        values[top++ + locals] = value;
+  /**
+   * Pushes a value into the operand stack of this frame.
+   *
+   * @param value the value that must be pushed into the stack.
+   * @throws IndexOutOfBoundsException if the operand stack is full.
+   */
+  public void push(final V value) {
+    if (numLocals + numStack >= values.length) {
+      throw new IndexOutOfBoundsException("Insufficient maximum stack size.");
     }
+    values[numLocals + (numStack++)] = value;
+  }
 
-    public void execute(final AbstractInsnNode insn,
-            final Interpreter<V> interpreter) throws AnalyzerException {
-        V value1, value2, value3, value4;
-        List<V> values;
-        int var;
+  /**
+   * Simulates the execution of the given instruction on this execution stack frame.
+   *
+   * @param insn the instruction to execute.
+   * @param interpreter the interpreter to use to compute values from other values.
+   * @throws AnalyzerException if the instruction cannot be executed on this execution frame (e.g. a
+   *     POP on an empty operand stack).
+   */
+  public void execute(final AbstractInsnNode insn, final Interpreter<V> interpreter)
+      throws AnalyzerException {
+    V value1;
+    V value2;
+    V value3;
+    V value4;
+    int var;
 
-        switch (insn.getOpcode()) {
-        case Opcodes.NOP:
-            break;
-        case Opcodes.ACONST_NULL:
-        case Opcodes.ICONST_M1:
-        case Opcodes.ICONST_0:
-        case Opcodes.ICONST_1:
-        case Opcodes.ICONST_2:
-        case Opcodes.ICONST_3:
-        case Opcodes.ICONST_4:
-        case Opcodes.ICONST_5:
-        case Opcodes.LCONST_0:
-        case Opcodes.LCONST_1:
-        case Opcodes.FCONST_0:
-        case Opcodes.FCONST_1:
-        case Opcodes.FCONST_2:
-        case Opcodes.DCONST_0:
-        case Opcodes.DCONST_1:
-        case Opcodes.BIPUSH:
-        case Opcodes.SIPUSH:
-        case Opcodes.LDC:
-            push(interpreter.newOperation(insn));
-            break;
-        case Opcodes.ILOAD:
-        case Opcodes.LLOAD:
-        case Opcodes.FLOAD:
-        case Opcodes.DLOAD:
-        case Opcodes.ALOAD:
-            push(interpreter.copyOperation(insn,
-                    getLocal(((VarInsnNode) insn).var)));
-            break;
-        case Opcodes.IALOAD:
-        case Opcodes.LALOAD:
-        case Opcodes.FALOAD:
-        case Opcodes.DALOAD:
-        case Opcodes.AALOAD:
-        case Opcodes.BALOAD:
-        case Opcodes.CALOAD:
-        case Opcodes.SALOAD:
-            value2 = pop();
-            value1 = pop();
-            push(interpreter.binaryOperation(insn, value1, value2));
-            break;
-        case Opcodes.ISTORE:
-        case Opcodes.LSTORE:
-        case Opcodes.FSTORE:
-        case Opcodes.DSTORE:
-        case Opcodes.ASTORE:
-            value1 = interpreter.copyOperation(insn, pop());
-            var = ((VarInsnNode) insn).var;
-            setLocal(var, value1);
-            if (value1.getSize() == 2) {
-                setLocal(var + 1, interpreter.newValue(null));
-            }
-            if (var > 0) {
-                Value local = getLocal(var - 1);
-                if (local != null && local.getSize() == 2) {
-                    setLocal(var - 1, interpreter.newValue(null));
-                }
-            }
-            break;
-        case Opcodes.IASTORE:
-        case Opcodes.LASTORE:
-        case Opcodes.FASTORE:
-        case Opcodes.DASTORE:
-        case Opcodes.AASTORE:
-        case Opcodes.BASTORE:
-        case Opcodes.CASTORE:
-        case Opcodes.SASTORE:
+    switch (insn.getOpcode()) {
+      case Opcodes.NOP:
+        break;
+      case Opcodes.ACONST_NULL:
+      case Opcodes.ICONST_M1:
+      case Opcodes.ICONST_0:
+      case Opcodes.ICONST_1:
+      case Opcodes.ICONST_2:
+      case Opcodes.ICONST_3:
+      case Opcodes.ICONST_4:
+      case Opcodes.ICONST_5:
+      case Opcodes.LCONST_0:
+      case Opcodes.LCONST_1:
+      case Opcodes.FCONST_0:
+      case Opcodes.FCONST_1:
+      case Opcodes.FCONST_2:
+      case Opcodes.DCONST_0:
+      case Opcodes.DCONST_1:
+      case Opcodes.BIPUSH:
+      case Opcodes.SIPUSH:
+      case Opcodes.LDC:
+        push(interpreter.newOperation(insn));
+        break;
+      case Opcodes.ILOAD:
+      case Opcodes.LLOAD:
+      case Opcodes.FLOAD:
+      case Opcodes.DLOAD:
+      case Opcodes.ALOAD:
+        push(interpreter.copyOperation(insn, getLocal(((VarInsnNode) insn).var)));
+        break;
+      case Opcodes.ISTORE:
+      case Opcodes.LSTORE:
+      case Opcodes.FSTORE:
+      case Opcodes.DSTORE:
+      case Opcodes.ASTORE:
+        value1 = interpreter.copyOperation(insn, pop());
+        var = ((VarInsnNode) insn).var;
+        setLocal(var, value1);
+        if (value1.getSize() == 2) {
+          setLocal(var + 1, interpreter.newEmptyValue(var + 1));
+        }
+        if (var > 0) {
+          Value local = getLocal(var - 1);
+          if (local != null && local.getSize() == 2) {
+            setLocal(var - 1, interpreter.newEmptyValue(var - 1));
+          }
+        }
+        break;
+      case Opcodes.IASTORE:
+      case Opcodes.LASTORE:
+      case Opcodes.FASTORE:
+      case Opcodes.DASTORE:
+      case Opcodes.AASTORE:
+      case Opcodes.BASTORE:
+      case Opcodes.CASTORE:
+      case Opcodes.SASTORE:
+        value3 = pop();
+        value2 = pop();
+        value1 = pop();
+        interpreter.ternaryOperation(insn, value1, value2, value3);
+        break;
+      case Opcodes.POP:
+        if (pop().getSize() == 2) {
+          throw new AnalyzerException(insn, "Illegal use of POP");
+        }
+        break;
+      case Opcodes.POP2:
+        if (pop().getSize() == 1 && pop().getSize() != 1) {
+          throw new AnalyzerException(insn, "Illegal use of POP2");
+        }
+        break;
+      case Opcodes.DUP:
+        value1 = pop();
+        if (value1.getSize() != 1) {
+          throw new AnalyzerException(insn, "Illegal use of DUP");
+        }
+        push(value1);
+        push(interpreter.copyOperation(insn, value1));
+        break;
+      case Opcodes.DUP_X1:
+        value1 = pop();
+        value2 = pop();
+        if (value1.getSize() != 1 || value2.getSize() != 1) {
+          throw new AnalyzerException(insn, "Illegal use of DUP_X1");
+        }
+        push(interpreter.copyOperation(insn, value1));
+        push(value2);
+        push(value1);
+        break;
+      case Opcodes.DUP_X2:
+        value1 = pop();
+        if (value1.getSize() == 1) {
+          value2 = pop();
+          if (value2.getSize() == 1) {
             value3 = pop();
-            value2 = pop();
-            value1 = pop();
-            interpreter.ternaryOperation(insn, value1, value2, value3);
-            break;
-        case Opcodes.POP:
-            if (pop().getSize() == 2) {
-                throw new AnalyzerException(insn, "Illegal use of POP");
-            }
-            break;
-        case Opcodes.POP2:
-            if (pop().getSize() == 1) {
-                if (pop().getSize() != 1) {
-                    throw new AnalyzerException(insn, "Illegal use of POP2");
-                }
+            if (value3.getSize() == 1) {
+              push(interpreter.copyOperation(insn, value1));
+              push(value3);
+              push(value2);
+              push(value1);
+              break;
             }
+          } else {
+            push(interpreter.copyOperation(insn, value1));
+            push(value2);
+            push(value1);
             break;
-        case Opcodes.DUP:
-            value1 = pop();
-            if (value1.getSize() != 1) {
-                throw new AnalyzerException(insn, "Illegal use of DUP");
-            }
+          }
+        }
+        throw new AnalyzerException(insn, "Illegal use of DUP_X2");
+      case Opcodes.DUP2:
+        value1 = pop();
+        if (value1.getSize() == 1) {
+          value2 = pop();
+          if (value2.getSize() == 1) {
+            push(value2);
             push(value1);
+            push(interpreter.copyOperation(insn, value2));
             push(interpreter.copyOperation(insn, value1));
             break;
-        case Opcodes.DUP_X1:
-            value1 = pop();
-            value2 = pop();
-            if (value1.getSize() != 1 || value2.getSize() != 1) {
-                throw new AnalyzerException(insn, "Illegal use of DUP_X1");
+          }
+        } else {
+          push(value1);
+          push(interpreter.copyOperation(insn, value1));
+          break;
+        }
+        throw new AnalyzerException(insn, "Illegal use of DUP2");
+      case Opcodes.DUP2_X1:
+        value1 = pop();
+        if (value1.getSize() == 1) {
+          value2 = pop();
+          if (value2.getSize() == 1) {
+            value3 = pop();
+            if (value3.getSize() == 1) {
+              push(interpreter.copyOperation(insn, value2));
+              push(interpreter.copyOperation(insn, value1));
+              push(value3);
+              push(value2);
+              push(value1);
+              break;
             }
+          }
+        } else {
+          value2 = pop();
+          if (value2.getSize() == 1) {
             push(interpreter.copyOperation(insn, value1));
             push(value2);
             push(value1);
             break;
-        case Opcodes.DUP_X2:
-            value1 = pop();
-            if (value1.getSize() == 1) {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    value3 = pop();
-                    if (value3.getSize() == 1) {
-                        push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
-                        break;
-                    }
-                } else {
-                    push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
-                    break;
-                }
-            }
-            throw new AnalyzerException(insn, "Illegal use of DUP_X2");
-        case Opcodes.DUP2:
-            value1 = pop();
-            if (value1.getSize() == 1) {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    push(value2);
-                    push(value1);
-                    push(interpreter.copyOperation(insn, value2));
-                    push(interpreter.copyOperation(insn, value1));
-                    break;
-                }
-            } else {
-                push(value1);
+          }
+        }
+        throw new AnalyzerException(insn, "Illegal use of DUP2_X1");
+      case Opcodes.DUP2_X2:
+        value1 = pop();
+        if (value1.getSize() == 1) {
+          value2 = pop();
+          if (value2.getSize() == 1) {
+            value3 = pop();
+            if (value3.getSize() == 1) {
+              value4 = pop();
+              if (value4.getSize() == 1) {
+                push(interpreter.copyOperation(insn, value2));
                 push(interpreter.copyOperation(insn, value1));
+                push(value4);
+                push(value3);
+                push(value2);
+                push(value1);
                 break;
-            }
-            throw new AnalyzerException(insn, "Illegal use of DUP2");
-        case Opcodes.DUP2_X1:
-            value1 = pop();
-            if (value1.getSize() == 1) {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    value3 = pop();
-                    if (value3.getSize() == 1) {
-                        push(interpreter.copyOperation(insn, value2));
-                        push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
-                        break;
-                    }
-                }
+              }
             } else {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
-                    break;
-                }
+              push(interpreter.copyOperation(insn, value2));
+              push(interpreter.copyOperation(insn, value1));
+              push(value3);
+              push(value2);
+              push(value1);
+              break;
             }
-            throw new AnalyzerException(insn, "Illegal use of DUP2_X1");
-        case Opcodes.DUP2_X2:
-            value1 = pop();
-            if (value1.getSize() == 1) {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    value3 = pop();
-                    if (value3.getSize() == 1) {
-                        value4 = pop();
-                        if (value4.getSize() == 1) {
-                            push(interpreter.copyOperation(insn, value2));
-                            push(interpreter.copyOperation(insn, value1));
-                            push(value4);
-                            push(value3);
-                            push(value2);
-                            push(value1);
-                            break;
-                        }
-                    } else {
-                        push(interpreter.copyOperation(insn, value2));
-                        push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
-                        break;
-                    }
-                }
-            } else {
-                value2 = pop();
-                if (value2.getSize() == 1) {
-                    value3 = pop();
-                    if (value3.getSize() == 1) {
-                        push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
-                        break;
-                    }
-                } else {
-                    push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
-                    break;
-                }
-            }
-            throw new AnalyzerException(insn, "Illegal use of DUP2_X2");
-        case Opcodes.SWAP:
-            value2 = pop();
-            value1 = pop();
-            if (value1.getSize() != 1 || value2.getSize() != 1) {
-                throw new AnalyzerException(insn, "Illegal use of SWAP");
+          }
+        } else {
+          value2 = pop();
+          if (value2.getSize() == 1) {
+            value3 = pop();
+            if (value3.getSize() == 1) {
+              push(interpreter.copyOperation(insn, value1));
+              push(value3);
+              push(value2);
+              push(value1);
+              break;
             }
-            push(interpreter.copyOperation(insn, value2));
+          } else {
             push(interpreter.copyOperation(insn, value1));
+            push(value2);
+            push(value1);
             break;
-        case Opcodes.IADD:
-        case Opcodes.LADD:
-        case Opcodes.FADD:
-        case Opcodes.DADD:
-        case Opcodes.ISUB:
-        case Opcodes.LSUB:
-        case Opcodes.FSUB:
-        case Opcodes.DSUB:
-        case Opcodes.IMUL:
-        case Opcodes.LMUL:
-        case Opcodes.FMUL:
-        case Opcodes.DMUL:
-        case Opcodes.IDIV:
-        case Opcodes.LDIV:
-        case Opcodes.FDIV:
-        case Opcodes.DDIV:
-        case Opcodes.IREM:
-        case Opcodes.LREM:
-        case Opcodes.FREM:
-        case Opcodes.DREM:
-            value2 = pop();
-            value1 = pop();
-            push(interpreter.binaryOperation(insn, value1, value2));
-            break;
-        case Opcodes.INEG:
-        case Opcodes.LNEG:
-        case Opcodes.FNEG:
-        case Opcodes.DNEG:
-            push(interpreter.unaryOperation(insn, pop()));
-            break;
-        case Opcodes.ISHL:
-        case Opcodes.LSHL:
-        case Opcodes.ISHR:
-        case Opcodes.LSHR:
-        case Opcodes.IUSHR:
-        case Opcodes.LUSHR:
-        case Opcodes.IAND:
-        case Opcodes.LAND:
-        case Opcodes.IOR:
-        case Opcodes.LOR:
-        case Opcodes.IXOR:
-        case Opcodes.LXOR:
-            value2 = pop();
-            value1 = pop();
-            push(interpreter.binaryOperation(insn, value1, value2));
-            break;
-        case Opcodes.IINC:
-            var = ((IincInsnNode) insn).var;
-            setLocal(var, interpreter.unaryOperation(insn, getLocal(var)));
-            break;
-        case Opcodes.I2L:
-        case Opcodes.I2F:
-        case Opcodes.I2D:
-        case Opcodes.L2I:
-        case Opcodes.L2F:
-        case Opcodes.L2D:
-        case Opcodes.F2I:
-        case Opcodes.F2L:
-        case Opcodes.F2D:
-        case Opcodes.D2I:
-        case Opcodes.D2L:
-        case Opcodes.D2F:
-        case Opcodes.I2B:
-        case Opcodes.I2C:
-        case Opcodes.I2S:
-            push(interpreter.unaryOperation(insn, pop()));
-            break;
-        case Opcodes.LCMP:
-        case Opcodes.FCMPL:
-        case Opcodes.FCMPG:
-        case Opcodes.DCMPL:
-        case Opcodes.DCMPG:
-            value2 = pop();
-            value1 = pop();
-            push(interpreter.binaryOperation(insn, value1, value2));
-            break;
-        case Opcodes.IFEQ:
-        case Opcodes.IFNE:
-        case Opcodes.IFLT:
-        case Opcodes.IFGE:
-        case Opcodes.IFGT:
-        case Opcodes.IFLE:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        case Opcodes.IF_ICMPEQ:
-        case Opcodes.IF_ICMPNE:
-        case Opcodes.IF_ICMPLT:
-        case Opcodes.IF_ICMPGE:
-        case Opcodes.IF_ICMPGT:
-        case Opcodes.IF_ICMPLE:
-        case Opcodes.IF_ACMPEQ:
-        case Opcodes.IF_ACMPNE:
-            value2 = pop();
-            value1 = pop();
-            interpreter.binaryOperation(insn, value1, value2);
-            break;
-        case Opcodes.GOTO:
-            break;
-        case Opcodes.JSR:
-            push(interpreter.newOperation(insn));
-            break;
-        case Opcodes.RET:
-            break;
-        case Opcodes.TABLESWITCH:
-        case Opcodes.LOOKUPSWITCH:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        case Opcodes.IRETURN:
-        case Opcodes.LRETURN:
-        case Opcodes.FRETURN:
-        case Opcodes.DRETURN:
-        case Opcodes.ARETURN:
-            value1 = pop();
-            interpreter.unaryOperation(insn, value1);
-            interpreter.returnOperation(insn, value1, returnValue);
-            break;
-        case Opcodes.RETURN:
-            if (returnValue != null) {
-                throw new AnalyzerException(insn, "Incompatible return type");
-            }
-            break;
-        case Opcodes.GETSTATIC:
-            push(interpreter.newOperation(insn));
-            break;
-        case Opcodes.PUTSTATIC:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        case Opcodes.GETFIELD:
-            push(interpreter.unaryOperation(insn, pop()));
-            break;
-        case Opcodes.PUTFIELD:
-            value2 = pop();
-            value1 = pop();
-            interpreter.binaryOperation(insn, value1, value2);
-            break;
-        case Opcodes.INVOKEVIRTUAL:
-        case Opcodes.INVOKESPECIAL:
-        case Opcodes.INVOKESTATIC:
-        case Opcodes.INVOKEINTERFACE: {
-            values = new ArrayList<V>();
-            String desc = ((MethodInsnNode) insn).desc;
-            for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
-                values.add(0, pop());
-            }
-            if (insn.getOpcode() != Opcodes.INVOKESTATIC) {
-                values.add(0, pop());
-            }
-            if (Type.getReturnType(desc) == Type.VOID_TYPE) {
-                interpreter.naryOperation(insn, values);
-            } else {
-                push(interpreter.naryOperation(insn, values));
-            }
-            break;
+          }
         }
-        case Opcodes.INVOKEDYNAMIC: {
-            values = new ArrayList<V>();
-            String desc = ((InvokeDynamicInsnNode) insn).desc;
-            for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) {
-                values.add(0, pop());
-            }
-            if (Type.getReturnType(desc) == Type.VOID_TYPE) {
-                interpreter.naryOperation(insn, values);
-            } else {
-                push(interpreter.naryOperation(insn, values));
-            }
-            break;
+        throw new AnalyzerException(insn, "Illegal use of DUP2_X2");
+      case Opcodes.SWAP:
+        value2 = pop();
+        value1 = pop();
+        if (value1.getSize() != 1 || value2.getSize() != 1) {
+          throw new AnalyzerException(insn, "Illegal use of SWAP");
         }
-        case Opcodes.NEW:
-            push(interpreter.newOperation(insn));
-            break;
-        case Opcodes.NEWARRAY:
-        case Opcodes.ANEWARRAY:
-        case Opcodes.ARRAYLENGTH:
-            push(interpreter.unaryOperation(insn, pop()));
-            break;
-        case Opcodes.ATHROW:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        case Opcodes.CHECKCAST:
-        case Opcodes.INSTANCEOF:
-            push(interpreter.unaryOperation(insn, pop()));
-            break;
-        case Opcodes.MONITORENTER:
-        case Opcodes.MONITOREXIT:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        case Opcodes.MULTIANEWARRAY:
-            values = new ArrayList<V>();
-            for (int i = ((MultiANewArrayInsnNode) insn).dims; i > 0; --i) {
-                values.add(0, pop());
-            }
-            push(interpreter.naryOperation(insn, values));
-            break;
-        case Opcodes.IFNULL:
-        case Opcodes.IFNONNULL:
-            interpreter.unaryOperation(insn, pop());
-            break;
-        default:
-            throw new RuntimeException("Illegal opcode " + insn.getOpcode());
+        push(interpreter.copyOperation(insn, value2));
+        push(interpreter.copyOperation(insn, value1));
+        break;
+      case Opcodes.IALOAD:
+      case Opcodes.LALOAD:
+      case Opcodes.FALOAD:
+      case Opcodes.DALOAD:
+      case Opcodes.AALOAD:
+      case Opcodes.BALOAD:
+      case Opcodes.CALOAD:
+      case Opcodes.SALOAD:
+      case Opcodes.IADD:
+      case Opcodes.LADD:
+      case Opcodes.FADD:
+      case Opcodes.DADD:
+      case Opcodes.ISUB:
+      case Opcodes.LSUB:
+      case Opcodes.FSUB:
+      case Opcodes.DSUB:
+      case Opcodes.IMUL:
+      case Opcodes.LMUL:
+      case Opcodes.FMUL:
+      case Opcodes.DMUL:
+      case Opcodes.IDIV:
+      case Opcodes.LDIV:
+      case Opcodes.FDIV:
+      case Opcodes.DDIV:
+      case Opcodes.IREM:
+      case Opcodes.LREM:
+      case Opcodes.FREM:
+      case Opcodes.DREM:
+      case Opcodes.ISHL:
+      case Opcodes.LSHL:
+      case Opcodes.ISHR:
+      case Opcodes.LSHR:
+      case Opcodes.IUSHR:
+      case Opcodes.LUSHR:
+      case Opcodes.IAND:
+      case Opcodes.LAND:
+      case Opcodes.IOR:
+      case Opcodes.LOR:
+      case Opcodes.IXOR:
+      case Opcodes.LXOR:
+      case Opcodes.LCMP:
+      case Opcodes.FCMPL:
+      case Opcodes.FCMPG:
+      case Opcodes.DCMPL:
+      case Opcodes.DCMPG:
+        value2 = pop();
+        value1 = pop();
+        push(interpreter.binaryOperation(insn, value1, value2));
+        break;
+      case Opcodes.INEG:
+      case Opcodes.LNEG:
+      case Opcodes.FNEG:
+      case Opcodes.DNEG:
+        push(interpreter.unaryOperation(insn, pop()));
+        break;
+      case Opcodes.IINC:
+        var = ((IincInsnNode) insn).var;
+        setLocal(var, interpreter.unaryOperation(insn, getLocal(var)));
+        break;
+      case Opcodes.I2L:
+      case Opcodes.I2F:
+      case Opcodes.I2D:
+      case Opcodes.L2I:
+      case Opcodes.L2F:
+      case Opcodes.L2D:
+      case Opcodes.F2I:
+      case Opcodes.F2L:
+      case Opcodes.F2D:
+      case Opcodes.D2I:
+      case Opcodes.D2L:
+      case Opcodes.D2F:
+      case Opcodes.I2B:
+      case Opcodes.I2C:
+      case Opcodes.I2S:
+        push(interpreter.unaryOperation(insn, pop()));
+        break;
+      case Opcodes.IFEQ:
+      case Opcodes.IFNE:
+      case Opcodes.IFLT:
+      case Opcodes.IFGE:
+      case Opcodes.IFGT:
+      case Opcodes.IFLE:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      case Opcodes.IF_ICMPEQ:
+      case Opcodes.IF_ICMPNE:
+      case Opcodes.IF_ICMPLT:
+      case Opcodes.IF_ICMPGE:
+      case Opcodes.IF_ICMPGT:
+      case Opcodes.IF_ICMPLE:
+      case Opcodes.IF_ACMPEQ:
+      case Opcodes.IF_ACMPNE:
+      case Opcodes.PUTFIELD:
+        value2 = pop();
+        value1 = pop();
+        interpreter.binaryOperation(insn, value1, value2);
+        break;
+      case Opcodes.GOTO:
+        break;
+      case Opcodes.JSR:
+        push(interpreter.newOperation(insn));
+        break;
+      case Opcodes.RET:
+        break;
+      case Opcodes.TABLESWITCH:
+      case Opcodes.LOOKUPSWITCH:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      case Opcodes.IRETURN:
+      case Opcodes.LRETURN:
+      case Opcodes.FRETURN:
+      case Opcodes.DRETURN:
+      case Opcodes.ARETURN:
+        value1 = pop();
+        interpreter.unaryOperation(insn, value1);
+        interpreter.returnOperation(insn, value1, returnValue);
+        break;
+      case Opcodes.RETURN:
+        if (returnValue != null) {
+          throw new AnalyzerException(insn, "Incompatible return type");
         }
-    }
-
-    /**
-     * Merges this frame with the given frame.
-     * 
-     * @param frame
-     *            a frame.
-     * @param interpreter
-     *            the interpreter used to merge values.
-     * @return <tt>true</tt> if this frame has been changed as a result of the
-     *         merge operation, or <tt>false</tt> otherwise.
-     * @throws AnalyzerException
-     *             if the frames have incompatible sizes.
-     */
-    public boolean merge(final Frame<? extends V> frame,
-            final Interpreter<V> interpreter) throws AnalyzerException {
-        if (top != frame.top) {
-            throw new AnalyzerException(null, "Incompatible stack heights");
+        break;
+      case Opcodes.GETSTATIC:
+        push(interpreter.newOperation(insn));
+        break;
+      case Opcodes.PUTSTATIC:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      case Opcodes.GETFIELD:
+        push(interpreter.unaryOperation(insn, pop()));
+        break;
+      case Opcodes.INVOKEVIRTUAL:
+      case Opcodes.INVOKESPECIAL:
+      case Opcodes.INVOKESTATIC:
+      case Opcodes.INVOKEINTERFACE:
+        {
+          List<V> valueList = new ArrayList<V>();
+          String methodDescriptor = ((MethodInsnNode) insn).desc;
+          for (int i = Type.getArgumentTypes(methodDescriptor).length; i > 0; --i) {
+            valueList.add(0, pop());
+          }
+          if (insn.getOpcode() != Opcodes.INVOKESTATIC) {
+            valueList.add(0, pop());
+          }
+          if (Type.getReturnType(methodDescriptor) == Type.VOID_TYPE) {
+            interpreter.naryOperation(insn, valueList);
+          } else {
+            push(interpreter.naryOperation(insn, valueList));
+          }
+          break;
         }
-        boolean changes = false;
-        for (int i = 0; i < locals + top; ++i) {
-            V v = interpreter.merge(values[i], frame.values[i]);
-            if (!v.equals(values[i])) {
-                values[i] = v;
-                changes = true;
-            }
+      case Opcodes.INVOKEDYNAMIC:
+        {
+          List<V> valueList = new ArrayList<V>();
+          String methodDesccriptor = ((InvokeDynamicInsnNode) insn).desc;
+          for (int i = Type.getArgumentTypes(methodDesccriptor).length; i > 0; --i) {
+            valueList.add(0, pop());
+          }
+          if (Type.getReturnType(methodDesccriptor) == Type.VOID_TYPE) {
+            interpreter.naryOperation(insn, valueList);
+          } else {
+            push(interpreter.naryOperation(insn, valueList));
+          }
+          break;
         }
-        return changes;
+      case Opcodes.NEW:
+        push(interpreter.newOperation(insn));
+        break;
+      case Opcodes.NEWARRAY:
+      case Opcodes.ANEWARRAY:
+      case Opcodes.ARRAYLENGTH:
+        push(interpreter.unaryOperation(insn, pop()));
+        break;
+      case Opcodes.ATHROW:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      case Opcodes.CHECKCAST:
+      case Opcodes.INSTANCEOF:
+        push(interpreter.unaryOperation(insn, pop()));
+        break;
+      case Opcodes.MONITORENTER:
+      case Opcodes.MONITOREXIT:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      case Opcodes.MULTIANEWARRAY:
+        List<V> valueList = new ArrayList<V>();
+        for (int i = ((MultiANewArrayInsnNode) insn).dims; i > 0; --i) {
+          valueList.add(0, pop());
+        }
+        push(interpreter.naryOperation(insn, valueList));
+        break;
+      case Opcodes.IFNULL:
+      case Opcodes.IFNONNULL:
+        interpreter.unaryOperation(insn, pop());
+        break;
+      default:
+        throw new AnalyzerException(insn, "Illegal opcode " + insn.getOpcode());
     }
+  }
 
-    /**
-     * Merges this frame with the given frame (case of a RET instruction).
-     * 
-     * @param frame
-     *            a frame
-     * @param access
-     *            the local variables that have been accessed by the subroutine
-     *            to which the RET instruction corresponds.
-     * @return <tt>true</tt> if this frame has been changed as a result of the
-     *         merge operation, or <tt>false</tt> otherwise.
-     */
-    public boolean merge(final Frame<? extends V> frame, final boolean[] access) {
-        boolean changes = false;
-        for (int i = 0; i < locals; ++i) {
-            if (!access[i] && !values[i].equals(frame.values[i])) {
-                values[i] = frame.values[i];
-                changes = true;
-            }
-        }
-        return changes;
+  /**
+   * Merges the given frame into this frame.
+   *
+   * @param frame a frame. This frame is left unchanged by this method.
+   * @param interpreter the interpreter used to merge values.
+   * @return {@literal true} if this frame has been changed as a result of the merge operation, or
+   *     {@literal false} otherwise.
+   * @throws AnalyzerException if the frames have incompatible sizes.
+   */
+  public boolean merge(final Frame<? extends V> frame, final Interpreter<V> interpreter)
+      throws AnalyzerException {
+    if (numStack != frame.numStack) {
+      throw new AnalyzerException(null, "Incompatible stack heights");
     }
+    boolean changed = false;
+    for (int i = 0; i < numLocals + numStack; ++i) {
+      V v = interpreter.merge(values[i], frame.values[i]);
+      if (!v.equals(values[i])) {
+        values[i] = v;
+        changed = true;
+      }
+    }
+    return changed;
+  }
 
-    /**
-     * Returns a string representation of this frame.
-     * 
-     * @return a string representation of this frame.
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < getLocals(); ++i) {
-            sb.append(getLocal(i));
-        }
-        sb.append(' ');
-        for (int i = 0; i < getStackSize(); ++i) {
-            sb.append(getStack(i).toString());
-        }
-        return sb.toString();
+  /**
+   * Merges the given frame into this frame (case of a subroutine). The operand stacks are not
+   * merged, and only the local variables that have not been used by the subroutine are merged.
+   *
+   * @param frame a frame. This frame is left unchanged by this method.
+   * @param localsUsed the local variables that are read or written by the subroutine. The i-th
+   *     element is true if and only if the local variable at index i is read or written by the
+   *     subroutine.
+   * @return {@literal true} if this frame has been changed as a result of the merge operation, or
+   *     {@literal false} otherwise.
+   */
+  public boolean merge(final Frame<? extends V> frame, final boolean[] localsUsed) {
+    boolean changed = false;
+    for (int i = 0; i < numLocals; ++i) {
+      if (!localsUsed[i] && !values[i].equals(frame.values[i])) {
+        values[i] = frame.values[i];
+        changed = true;
+      }
+    }
+    return changed;
+  }
+
+  /**
+   * Returns a string representation of this frame.
+   *
+   * @return a string representation of this frame.
+   */
+  @Override
+  public String toString() {
+    StringBuilder stringBuilder = new StringBuilder();
+    for (int i = 0; i < getLocals(); ++i) {
+      stringBuilder.append(getLocal(i));
+    }
+    stringBuilder.append(' ');
+    for (int i = 0; i < getStackSize(); ++i) {
+      stringBuilder.append(getStack(i).toString());
     }
+    return stringBuilder.toString();
+  }
 }