Merge pull request #7 from lrytz/interpreterCopy

Call interpreter.copyInstruction consistently for all copied values

Author: lrytz

src/main/java/scala/tools/asm/tree/analysis/Frame.java

@@ -351,7 +351,7 @@ public void execute(final AbstractInsnNode insn,
             if (value1.getSize() != 1) {
                 throw new AnalyzerException(insn, "Illegal use of DUP");
             }
-            push(value1);
+            push(interpreter.copyOperation(insn, value1));
             push(interpreter.copyOperation(insn, value1));
             break;
         case Opcodes.DUP_X1:
@@ -361,8 +361,8 @@ public void execute(final AbstractInsnNode insn,
                 throw new AnalyzerException(insn, "Illegal use of DUP_X1");
             }
             push(interpreter.copyOperation(insn, value1));
-            push(value2);
-            push(value1);
+            push(interpreter.copyOperation(insn, value2));
+            push(interpreter.copyOperation(insn, value1));
             break;
         case Opcodes.DUP_X2:
             value1 = pop();
@@ -372,15 +372,15 @@ public void execute(final AbstractInsnNode insn,
                     value3 = pop();
                     if (value3.getSize() == 1) {
                         push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
+                        push(interpreter.copyOperation(insn, value3));
+                        push(interpreter.copyOperation(insn, value2));
+                        push(interpreter.copyOperation(insn, value1));
                         break;
                     }
                 } else {
                     push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
+                    push(interpreter.copyOperation(insn, value2));
+                    push(interpreter.copyOperation(insn, value1));
                     break;
                 }
             }
@@ -390,14 +390,14 @@ public void execute(final AbstractInsnNode insn,
             if (value1.getSize() == 1) {
                 value2 = pop();
                 if (value2.getSize() == 1) {
-                    push(value2);
-                    push(value1);
+                    push(interpreter.copyOperation(insn, value2));
+                    push(interpreter.copyOperation(insn, value1));
                     push(interpreter.copyOperation(insn, value2));
                     push(interpreter.copyOperation(insn, value1));
                     break;
                 }
             } else {
-                push(value1);
+                push(interpreter.copyOperation(insn, value1));
                 push(interpreter.copyOperation(insn, value1));
                 break;
             }
@@ -411,18 +411,18 @@ public void execute(final AbstractInsnNode insn,
                     if (value3.getSize() == 1) {
                         push(interpreter.copyOperation(insn, value2));
                         push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
+                        push(interpreter.copyOperation(insn, value3));
+                        push(interpreter.copyOperation(insn, value2));
+                        push(interpreter.copyOperation(insn, value1));
                         break;
                     }
                 }
             } else {
                 value2 = pop();
                 if (value2.getSize() == 1) {
                     push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
+                    push(interpreter.copyOperation(insn, value2));
+                    push(interpreter.copyOperation(insn, value1));
                     break;
                 }
             }
@@ -438,18 +438,18 @@ public void execute(final AbstractInsnNode insn,
                         if (value4.getSize() == 1) {
                             push(interpreter.copyOperation(insn, value2));
                             push(interpreter.copyOperation(insn, value1));
-                            push(value4);
-                            push(value3);
-                            push(value2);
-                            push(value1);
+                            push(interpreter.copyOperation(insn, value4));
+                            push(interpreter.copyOperation(insn, value3));
+                            push(interpreter.copyOperation(insn, value2));
+                            push(interpreter.copyOperation(insn, value1));
                             break;
                         }
                     } else {
                         push(interpreter.copyOperation(insn, value2));
                         push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
+                        push(interpreter.copyOperation(insn, value3));
+                        push(interpreter.copyOperation(insn, value2));
+                        push(interpreter.copyOperation(insn, value1));
                         break;
                     }
                 }
@@ -459,15 +459,15 @@ public void execute(final AbstractInsnNode insn,
                     value3 = pop();
                     if (value3.getSize() == 1) {
                         push(interpreter.copyOperation(insn, value1));
-                        push(value3);
-                        push(value2);
-                        push(value1);
+                        push(interpreter.copyOperation(insn, value3));
+                        push(interpreter.copyOperation(insn, value2));
+                        push(interpreter.copyOperation(insn, value1));
                         break;
                     }
                 } else {
                     push(interpreter.copyOperation(insn, value1));
-                    push(value2);
-                    push(value1);
+                    push(interpreter.copyOperation(insn, value2));
+                    push(interpreter.copyOperation(insn, value1));
                     break;
                 }
             }